Port Extension Commands to Mac.

chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm

 // 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.
 
 #import "browser_actions_controller.h"
 
 #include <cmath>
 #include <string>
 
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
+#include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h"
 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"
 #import "chrome/browser/ui/cocoa/image_button_cell.h"
 #import "chrome/browser/ui/cocoa/menu_button.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_observer.h"
@@ skipping 140 matching lines @@
 // Returns the ID of the currently selected tab or -1 if none exists.
 - (int)currentTabId;
 @end
 
 // A helper class to proxy extension notifications to the view controller's
 // appropriate methods.
 class ExtensionServiceObserverBridge : public content::NotificationObserver,
                                        public ExtensionToolbarModel::Observer {
  public:
   ExtensionServiceObserverBridge(BrowserActionsController* owner,
-                                  Profile* profile) : owner_(owner) {
+                                 Browser* browser)
+    : owner_(owner), browser_(browser) {
     registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE,
-                   content::Source<Profile>(profile));
+                   content::Source<Profile>(browser->profile()));
+    registrar_.Add(this,
+                   chrome::NOTIFICATION_EXTENSION_COMMAND_BROWSER_ACTION_MAC,
+                   content::Source<Profile>(browser->profile()));
   }
 
   // Overridden from content::NotificationObserver.
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) {
     switch (type) {
       case chrome::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: {
+        std::pair<const std::string, gfx::NativeWindow>* payload =
+            content::Details<std::pair<const std::string, gfx::NativeWindow> >(
+                details).ptr();
+        std::string extension_id = payload->first;
+        gfx::NativeWindow window = payload->second;
+        if (window != browser_->window()->GetNativeWindow())
+          break;
+        ExtensionService* service = browser_->profile()->GetExtensionService();
+        if (!service)
+          break;
+        const Extension* extension = service->GetExtensionById(extension_id,
+                                                               false);
+        if (!extension)
+          break;
+        BrowserActionButton* button = [owner_ buttonForExtension:extension];
+        [owner_ browserActionClicked:button];
+        break;
+      }
       default:
         NOTREACHED() << L"Unexpected notification";
     }
   }
 
   // ExtensionToolbarModel::Observer implementation.
   void BrowserActionAdded(const Extension* extension, int index) {
     [owner_ createActionButtonForExtension:extension withIndex:index];
     [owner_ resizeContainerAndAnimate:NO];
   }
 
   void BrowserActionRemoved(const Extension* extension) {
     [owner_ removeActionButtonForExtension:extension];
     [owner_ resizeContainerAndAnimate:NO];
   }
 
  private:
   // The object we need to inform when we get a notification. Weak. Owns us.
   BrowserActionsController* owner_;
 
+  // The browser we listen for events from. Weak.
+  Browser* browser_;
+
   // Used for registering to receive notifications and automatic clean up.
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionServiceObserverBridge);
 };
 
 @implementation BrowserActionsController
 
 @synthesize containerView = containerView_;
 
 #pragma mark -
 #pragma mark Public Methods
 
 - (id)initWithBrowser:(Browser*)browser
         containerView:(BrowserActionsContainerView*)container {
   DCHECK(browser && container);
 
   if ((self = [super init])) {
     browser_ = browser;
     profile_ = browser->profile();
 
     if (!profile_->GetPrefs()->FindPreference(
         prefs::kBrowserActionContainerWidth))
       [BrowserActionsController registerUserPrefs:profile_->GetPrefs()];
 
-    observer_.reset(new ExtensionServiceObserverBridge(self, profile_));
+    observer_.reset(new ExtensionServiceObserverBridge(self, browser_));
     ExtensionService* extensionService = profile_->GetExtensionService();
     // |extensionService| can be NULL in Incognito.
     if (extensionService) {
       toolbarModel_ = extensionService->toolbar_model();
       toolbarModel_->AddObserver(observer_.get());
     }
 
     containerView_ = container;
     [containerView_ setPostsFrameChangedNotifications:YES];
     [[NSNotificationCenter defaultCenter]
@@ skipping 582 matching lines @@
   const extensions::ExtensionList& toolbar_items =
       toolbarModel_->toolbar_items();
   if (index < toolbar_items.size()) {
     const Extension* extension = toolbar_items[index];
     return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())];
   }
   return nil;
 }
 
 @end