Remove GetExtensionService from Profile.

chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/api/commands/command_service_factory.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_icon_factory.h"
 #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"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/custom_button.h"
 #include "chrome/browser/ui/gtk/extensions/extension_popup_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_button.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
@@ skipping 466 matching lines @@
       theme_service_(GtkThemeService::GetFrom(browser->profile())),
       model_(NULL),
       hbox_(gtk_hbox_new(FALSE, 0)),
       button_hbox_(gtk_chrome_shrinkable_hbox_new(TRUE, FALSE, kButtonPadding)),
       drag_button_(NULL),
       drop_index_(-1),
       resize_animation_(this),
       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.

[Yoyo Zhou, 2012/11/21 00:27:13]

This comment is wrong. (However, I would not delete the check below it.)

[Miranda Callahan, 2012/11/26 22:14:24]

Done.

   if (!extension_service)
     return;
 
   overflow_button_.reset(new CustomDrawButton(
       theme_service_,
       IDR_BROWSER_ACTIONS_OVERFLOW,
       IDR_BROWSER_ACTIONS_OVERFLOW_P,
       IDR_BROWSER_ACTIONS_OVERFLOW_H,
       0,
       gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_NONE)));
@@ skipping 174 matching lines @@
 }
 
 void BrowserActionsToolbarGtk::UpdateVisibility() {
   gtk_widget_set_visible(widget(), button_count() != 0);
 }
 
 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() {
   ExtensionPopupGtk* popup = ExtensionPopupGtk::get_current_extension_popup();
   if (popup)
     popup->DestroyPopup();
 }
 
 void BrowserActionsToolbarGtk::AnimateToShowNIcons(int count) {
   desired_width_ = WidthForIconCount(count);
@@ skipping 380 matching lines @@
 
   menu->PopupAsContext(gfx::Point(event->x_root, event->y_root),
                        event->time);
   return TRUE;
 }
 
 void BrowserActionsToolbarGtk::OnButtonShowOrHide(GtkWidget* sender) {
   if (!resize_animation_.is_animating())
     UpdateChevronVisibility();
 }