chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm - 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/cocoa/extensions/browser_actions_controller.mm

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/cocoa/extensions/browser_actions_controller.mm

diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm

index 92daa8e13349e8291a9e7df97915349e53b403b5..f3da81c6fd7796caf4eb08a3ee3d25b6f028115e 100644

--- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm

+++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm

@@ -282,13 +282,9 @@ class ExtensionServiceObserverBridge : public content::NotificationObserver,

profile_ = browser->profile();

observer_.reset(new ExtensionServiceObserverBridge(self, browser_));

- ExtensionService* extensionService =

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

- // |extensionService| can be NULL in Incognito.

- if (extensionService) {

- toolbarModel_ = extensionService->toolbar_model();

+ toolbarModel_ = ExtensionToolbarModel::Get(profile_);

+ if (toolbarModel_)

toolbarModel_->AddObserver(observer_.get());

- }

containerView_ = container;

[containerView_ setPostsFrameChangedNotifications:YES];