Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / cocoa / extensions / browser_actions_controller.mm

diff --git a/src/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm b/src/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
index cc758af..504809d 100644 (file)
--- a/src/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
+++ b/src/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
@@ -7,12 +7,10 @@
 #include <cmath>
 #include <string>
 
-#include "base/prefs/pref_service.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #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_toolbar_model.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
@@ -26,13 +24,11 @@
 #import "chrome/browser/ui/cocoa/menu_button.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
-#include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
-#include "extensions/browser/extension_system.h"
-#include "extensions/browser/pref_names.h"
+#include "extensions/browser/extension_registry.h"
 #include "grit/theme_resources.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h"
 
@@ -185,11 +181,13 @@ class ExtensionServiceObserverBridge
   ExtensionServiceObserverBridge(BrowserActionsController* owner,
                                  Browser* browser)
     : owner_(owner), browser_(browser) {
-    registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE,
-                   content::Source<Profile>(browser->profile()));
     registrar_.Add(this,
-                   chrome::NOTIFICATION_EXTENSION_COMMAND_BROWSER_ACTION_MAC,
+                   extensions::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE,
                    content::Source<Profile>(browser->profile()));
+    registrar_.Add(
+        this,
+        extensions::NOTIFICATION_EXTENSION_COMMAND_BROWSER_ACTION_MAC,
+        content::Source<Profile>(browser->profile()));
   }
 
   // Overridden from content::NotificationObserver.
@@ -198,14 +196,14 @@ class ExtensionServiceObserverBridge
       const content::NotificationSource& source,
       const content::NotificationDetails& details) OVERRIDE {
     switch (type) {
-      case chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE: {
+      case extensions::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE: {
         ExtensionPopupController* popup = [ExtensionPopupController popup];
         if (popup && ![popup isClosing])
           [popup close];
 
         break;
       }
-      case chrome::NOTIFICATION_EXTENSION_COMMAND_BROWSER_ACTION_MAC: {
+      case extensions::NOTIFICATION_EXTENSION_COMMAND_BROWSER_ACTION_MAC: {
         std::pair<const std::string, gfx::NativeWindow>* payload =
             content::Details<std::pair<const std::string, gfx::NativeWindow> >(
                 details).ptr();
@@ -378,19 +376,6 @@ class ExtensionServiceObserverBridge
 - (CGFloat)savedWidth {
   if (!toolbarModel_)
     return 0;
-  if (!profile_->GetPrefs()->HasPrefPath(
-          extensions::pref_names::kToolbarSize)) {
-    // Migration code to the new VisibleIconCount pref.
-    // TODO(mpcomplete): remove this at some point.
-    double predefinedWidth = profile_->GetPrefs()->GetDouble(
-        extensions::pref_names::kBrowserActionContainerWidth);
-    if (predefinedWidth != 0) {
-      int iconWidth = kBrowserActionWidth + kBrowserActionButtonPadding;
-      int extraWidth = kChevronWidth;
-      toolbarModel_->SetVisibleIconCount(
-          (predefinedWidth - extraWidth) / iconWidth);
-    }
-  }
 
   int savedButtonCount = toolbarModel_->GetVisibleIconCount();
   if (savedButtonCount < 0 ||  // all icons are visible
@@ -444,11 +429,8 @@ class ExtensionServiceObserverBridge
 }
 
 - (void)activateBrowserAction:(const std::string&)extension_id {
-  ExtensionService* service = browser_->profile()->GetExtensionService();
-  if (!service)
-    return;
-
-  const Extension* extension = service->GetExtensionById(extension_id, false);
+  const Extension* extension = extensions::ExtensionRegistry::Get(
+      browser_->profile())->enabled_extensions().GetByID(extension_id);
   if (!extension)
     return;
 
@@ -764,9 +746,9 @@ class ExtensionServiceObserverBridge
   GURL popupUrl;
   switch (toolbarModel_->ExecuteBrowserAction(extension, browser_, &popupUrl,
                                               shouldGrant)) {
-    case extensions::ExtensionToolbarModel::ACTION_NONE:
+    case ExtensionAction::ACTION_NONE:
       break;
-    case extensions::ExtensionToolbarModel::ACTION_SHOW_POPUP: {
+    case ExtensionAction::ACTION_SHOW_POPUP: {
       NSPoint arrowPoint = [self popupPointForBrowserAction:extension];
       [ExtensionPopupController showURL:popupUrl
                               inBrowser:browser_