Implement initial chrome.browserAction.openPopup API.

chrome/browser/extensions/extension_toolbar_model.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/extensions/extension_toolbar_model.h"
 
+#include <string>
+
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 132 matching lines @@
     if (popup_url_out)
       *popup_url_out = browser_action->GetPopupUrl(tab_id);
     return ACTION_SHOW_POPUP;
   }
 
   extensions::ExtensionActionAPI::BrowserActionExecuted(
       service_->profile(), *browser_action, web_contents);
   return ACTION_NONE;
 }
 
+GURL ExtensionToolbarModel::GetPopupUrl(
+    const Extension* extension, Browser* browser) {

[mark a. foltz, 2013/10/11 20:25:30]

const Extension& instead?

[mark a. foltz, 2013/10/11 20:25:30]

DCHECK(browser)

[justinlin, 2013/10/16 07:06:48]

Done.

[justinlin, 2013/10/16 07:06:48]

From what I've seen in code around here, I think we usually pass pointers to
Extension instances, I think because they can be NULL.

+  content::WebContents* web_contents = NULL;
+  int tab_id = 0;
+  if (!ExtensionTabUtil::GetDefaultTab(browser, &web_contents, &tab_id))
+    return GURL();
+
+  ExtensionAction* browser_action =
+      extensions::ExtensionActionManager::Get(service_->profile())->
+      GetBrowserAction(*extension);

[mark a. foltz, 2013/10/11 20:25:30]

What if the extension has no browser action?

[justinlin, 2013/10/16 07:06:48]

Done.

+  return browser_action->GetPopupUrl(tab_id);
+}
+
 void ExtensionToolbarModel::SetVisibleIconCount(int count) {
   visible_icon_count_ =
       count == static_cast<int>(toolbar_items_.size()) ? -1 : count;
   prefs_->SetInteger(prefs::kExtensionToolbarSize, visible_icon_count_);
 }
 
 void ExtensionToolbarModel::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
@@ skipping 278 matching lines @@
 
   if (last_known_positions_.size() > pref_position_size) {
     // Need to update pref because we have extra icons. But can't call
     // UpdatePrefs() directly within observation closure.
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&ExtensionToolbarModel::UpdatePrefs,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 }
+
+void ExtensionToolbarModel::ShowBrowserActionPopup(
+    const extensions::Extension* extension) {
+  FOR_EACH_OBSERVER(Observer, observers_, BrowserActionShowPopup(extension));
+}