chrome/browser/ui/views/browser_actions_container.cc - Issue 48853005: Remove ExtensionToolbarModel from ExtensionService.

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/browser_actions_container.cc

Issue 48853005: Remove ExtensionToolbarModel from ExtensionService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Compile after rebase Created 7 years, 1 month ago

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

Jump to:

Index: chrome/browser/ui/views/browser_actions_container.cc

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

index 5e525e39ee779f38963dd6fe8ed7c53c452efa1d..18b653a8a76328b9d1e677eb0945f102912785c5 100644

--- a/chrome/browser/ui/views/browser_actions_container.cc

+++ b/chrome/browser/ui/views/browser_actions_container.cc

@@ -75,12 +75,9 @@ BrowserActionsContainer::BrowserActionsContainer(Browser* browser,

show_menu_task_factory_(this) {

set_id(VIEW_ID_BROWSER_ACTION_TOOLBAR);

- ExtensionService* service =

- extensions::ExtensionSystem::Get(profile_)->extension_service();

- if (service) {

- model_ = service->toolbar_model();

+ model_ = ExtensionToolbarModel::Get(browser->profile());

+ if (model_)

model_->AddObserver(this);

- }

extension_keybinding_registry_.reset(new ExtensionKeybindingRegistryViews(

browser->profile(),