Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added valid resource id for task manager title when creating shields panel bubble #13367

Merged
merged 1 commit into from
May 18, 2022
Merged

Added valid resource id for task manager title when creating shields panel bubble #13367

merged 1 commit into from
May 18, 2022

Conversation

nullhook
Copy link
Contributor

@nullhook nullhook commented May 18, 2022 •
edited by bsclifton
Loading

Resolves brave/brave-browser#22814

When creating ShieldsPanelUI bubble a valid resource id for task manager title wasn't given and a crash was happening when TaskManager was fetching it's title.

Adding a valid resource id for task manager title fixed the crash.

image

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally: npm run test -- brave_browser_tests, npm run test -- brave_unit_tests, npm run lint, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

@nullhook nullhook changed the title Added proper resource id when creating shields panel bubble Added valid resource id for task manager title when creating shields panel bubble May 18, 2022
simonhong
simonhong reviewed May 18, 2022
View reviewed changes
browser/ui/views/brave_actions/brave_shields_action_view.cc
@@ -189,7 +189,7 @@ void BraveShieldsActionView::ButtonPressed() {
if (!webui_bubble_manager_) {
webui_bubble_manager_ =
std::make_unique<WebUIBubbleManagerT<ShieldsPanelUI>>(
this, profile_, GURL(kShieldsPanelURL), 1);
this, profile_, GURL(kShieldsPanelURL), IDS_BRAVE_SHIELDS);
Copy link
Member

@simonhong simonhong May 18, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I found that vpn panel also have same issue. - #13368

@nullhook nullhook merged commit df9b035 into master May 18, 2022
@nullhook nullhook deleted the shields_crash_v2 branch May 18, 2022 03:49
petemill
petemill reviewed May 18, 2022
View reviewed changes
browser/ui/views/brave_actions/brave_shields_action_view.cc
@@ -189,7 +189,7 @@ void BraveShieldsActionView::ButtonPressed() {
if (!webui_bubble_manager_) {
webui_bubble_manager_ =
std::make_unique<WebUIBubbleManagerT<ShieldsPanelUI>>(
this, profile_, GURL(kShieldsPanelURL), 1);
this, profile_, GURL(kShieldsPanelURL), IDS_BRAVE_SHIELDS);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm thinking we should use "Brave Shields UI" so that people don't get confused and think this is a process for the actual shields work, and know this is for the UI renderer.

Copy link
Contributor Author

@nullhook nullhook May 18, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the name has "Tool: ..." as part of the string vs a process "GPU Process"

Copy link
Contributor Author

@nullhook nullhook May 18, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can do it as a follow up: brave/brave-browser#22924

@nullhook nullhook mentioned this pull request May 18, 2022
Merged
7 tasks
@kjozwiak kjozwiak added this to the 1.40.x - Beta milestone May 18, 2022
@kjozwiak
Copy link
Member

Verification PASSED on Win 11 x64 using the following build(s):

Brave | 1.40.65 Chromium: 102.0.5005.50 (Official Build) nightly (64-bit)
-- | --
Revision | f6e2cf8f59ec714bdcff8499991d55898875f287-refs/branch-heads/5005@{#648}
OS | Windows 11 Version 21H2 (Build 22000.675)

Went through the STR/Cases outlined via brave/brave-browser#22814 (comment) and ensured Brave wasn't crashing when clicking on the Brave Shields icon while in a Google Meeting. Also checked the following:

  • ensured that disabling/enabling shields while in a Google Meeting didn't cause any crashes
  • ensured that changing the settings via the Advanced controls didn't cause any crashes while in a Google Meeting
    • changing Aggressively block trackers & ads, Block trackers & ads & Allow trackers & ads
    • disabling/enabling Upgrade connections to HTTPS
    • enabling/disabling Block scripts
    • changing Aggressively blocking fingerprinting, Allow fingerprinting & Allow fingerprinting
    • changing Block all cookies, Block cross-site cookies & Allow all cookies

Example of the shields panel being displayed without Brave crashing while in a Google Meeting:

image

@kjozwiak kjozwiak mentioned this pull request May 18, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@simonhong simonhong simonhong approved these changes

@petemill petemill petemill approved these changes

Assignees

@nullhook nullhook

Labels
None yet
Projects
None yet
Milestone
1.40.x - Release
Development

Successfully merging this pull request may close these issues.

crash when clicking on shields while using Google Meet
4 participants
@nullhook @kjozwiak @petemill @simonhong