Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7058)

Unified Diff: chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm

Issue 11365181: Remove GetExtensionService from Profile. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: replace missing extension_system include Created 8 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:
View side-by-side diff with in-line comments
Download patch
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 a178818d16ddd33be74b57ef0446380742ac1b5f..e1c0dde82fbb9a5e30bd142083db3194a30b72fb 100644
--- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
@@ -11,6 +11,7 @@
#include "chrome/browser/extensions/extension_action.h"
#include "chrome/browser/extensions/extension_action_manager.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/extension_toolbar_model.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
@@ -268,7 +269,8 @@ class ExtensionServiceObserverBridge : public content::NotificationObserver,
[BrowserActionsController registerUserPrefs:profile_->GetPrefs()];
observer_.reset(new ExtensionServiceObserverBridge(self, browser_));
- ExtensionService* extensionService = profile_->GetExtensionService();
+ ExtensionService* extensionService =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
// |extensionService| can be NULL in Incognito.
if (extensionService) {
toolbarModel_ = extensionService->toolbar_model();
@@ -767,7 +769,8 @@ class ExtensionServiceObserverBridge : public content::NotificationObserver,
// Only display incognito-enabled extensions while in incognito mode.
return
(!profile_->IsOffTheRecord() ||
- profile_->GetExtensionService()->IsIncognitoEnabled(extension->id()));
+ extensions::ExtensionSystem::Get(profile_)->extension_service()->
+ IsIncognitoEnabled(extension->id()));
}
- (void)showChevronIfNecessaryInFrame:(NSRect)frame animate:(BOOL)animate {
« no previous file with comments | « chrome/browser/ui/browser_browsertest.cc ('k') | chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698