| 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 bcdb5150ce7d812c127ba948b1f1416b0cb0b0f2..ec8f025b81f3bfbe1404341b4c8481257a2099c2 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"
|
| @@ -506,7 +507,8 @@ BrowserActionsToolbarGtk::BrowserActionsToolbarGtk(Browser* browser)
|
| desired_width_(0),
|
| start_width_(0),
|
| weak_factory_(this) {
|
| - ExtensionService* extension_service = profile_->GetExtensionService();
|
| + ExtensionService* extension_service =
|
| + extensions::ExtensionSystem::Get(profile_)->extension_service();
|
| // The |extension_service| can be NULL in Incognito.
|
| if (!extension_service)
|
| return;
|
| @@ -702,7 +704,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() {
|
|
|