chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc - Issue 542493002: Cleanup BrowserActionsContainer a bit

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc

Issue 542493002: Cleanup BrowserActionsContainer a bit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: +DCHECK Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc ('k') | chrome/browser/ui/views/toolbar/browser_actions_container.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc

diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc

index 010c0033f9e842692f441543db4f84c6ea8f7b23..3ea7b344e86347c5e810b1f1a0f888bc243a075f 100644

--- a/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc

+++ b/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc

@@ -527,8 +527,6 @@ ExtensionInstalledBubbleView::~ExtensionInstalledBubbleView() {}

bool ExtensionInstalledBubbleView::MaybeShowNow() {

BrowserView* browser_view =

BrowserView::GetBrowserViewForBrowser(bubble_.browser());

- extensions::ExtensionActionManager* extension_action_manager =

- extensions::ExtensionActionManager::Get(bubble_.browser()->profile());

views::View* reference_view = NULL;

if (bubble_.type() == bubble_.BROWSER_ACTION) {

@@ -537,8 +535,7 @@ bool ExtensionInstalledBubbleView::MaybeShowNow() {

if (container->animating())

return false;

- reference_view = container->GetBrowserActionView(

- extension_action_manager->GetBrowserAction(*bubble_.extension()));

+ reference_view = container->GetViewForExtension(bubble_.extension());

// If the view is not visible then it is in the chevron, so point the

// install bubble to the chevron instead. If this is an incognito window,

// both could be invisible.

@@ -550,7 +547,8 @@ bool ExtensionInstalledBubbleView::MaybeShowNow() {

} else if (bubble_.type() == bubble_.PAGE_ACTION) {

LocationBarView* location_bar_view = browser_view->GetLocationBarView();

ExtensionAction* page_action =

- extension_action_manager->GetPageAction(*bubble_.extension());

+ extensions::ExtensionActionManager::Get(bubble_.browser()->profile())->

+ GetPageAction(*bubble_.extension());

location_bar_view->SetPreviewEnabledPageAction(page_action,

true); // preview_enabled

reference_view = location_bar_view->GetPageActionView(page_action);