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

Unified Diff: chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc

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/gtk/browser_actions_toolbar_gtk.cc
diff --git a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
index eb2fa88f9f5514ac9bd51079ab3b3510a70fd356..9614601345b44d868d66f315120568d46a712232 100644
--- a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
@@ -20,6 +20,7 @@
#include "chrome/browser/extensions/extension_action_manager.h"
#include "chrome/browser/extensions/extension_context_menu_model.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sessions/session_tab_helper.h"
#include "chrome/browser/ui/browser.h"
@@ -502,8 +503,8 @@ BrowserActionsToolbarGtk::BrowserActionsToolbarGtk(Browser* browser)
desired_width_(0),
start_width_(0),
weak_factory_(this) {
- ExtensionService* extension_service = profile_->GetExtensionService();
- // The |extension_service| can be NULL in Incognito.
+ ExtensionService* extension_service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
if (!extension_service)
return;
@@ -698,7 +699,8 @@ bool BrowserActionsToolbarGtk::ShouldDisplayBrowserAction(
const Extension* extension) {
// 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 BrowserActionsToolbarGtk::HidePopup() {

Powered by Google App Engine
This is Rietveld 408576698