Implement initial chrome.browserAction.openPopup API.

chrome/browser/extensions/api/extension_action/extension_action_api.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/api/extension_action/extension_action_api.h"
 
-#include <string>
+#include <set>

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

Did you mean to remove #include <string>?

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

Yea, it's already in the .h, actually we don't need set here..

 
 #include "base/base64.h"
 #include "base/lazy_instance.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/extension_action/extension_page_actions_api_constants.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_function_registry.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/location_bar_controller.h"
 #include "chrome/browser/extensions/state_store.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
+#include "chrome/common/extensions/features/simple_feature.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/common/error_utils.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 
+using chrome::VersionInfo;
 using content::WebContents;
 
 namespace page_actions_keys = extension_page_actions_api_constants;
 
 namespace extensions {
 
 namespace {
 
 const char kBrowserActionStorageKey[] = "browser_action";
 const char kPopupUrlStorageKey[] = "poupup_url";
 const char kTitleStorageKey[] = "title";
 const char kIconStorageKey[] = "icon";
 const char kBadgeTextStorageKey[] = "badge_text";
 const char kBadgeBackgroundColorStorageKey[] = "badge_background_color";
 const char kBadgeTextColorStorageKey[] = "badge_text_color";
 const char kAppearanceStorageKey[] = "appearance";
 
 // Whether the browser action is visible in the toolbar.
 const char kBrowserActionVisible[] = "browser_action_visible";
 
 // Errors.
 const char kNoExtensionActionError[] =
     "This extension has no action specified.";
 const char kNoTabError[] = "No tab with id: *.";
 const char kNoPageActionError[] =
     "This extension has no page action specified.";
 const char kUrlNotActiveError[] = "This url is no longer active: *.";
 
+// Whitelisted extensions for the openPopup API.
+const char* whitelisted_extensions[] = {

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

kOpenPopupWhitelistedExtensions

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

moved to _api_features.json

+  "enhhojjnijigcajfphajepfemndkmdlo",  // Dev
+  "pkedcjkdefgpdelpbcmbmeomcjbeemfm",  // Trusted Tester
+  "fmfcbgogabcbclcofgocippekhfcmgfj",  // Staging
+  "hfaagokkkhdbgiakmmlclaapfelnkoah",  // Canary
+  "F155646B5D1CA545F7E1E4E20D573DFDD44C2540",  // Trusted Tester (public)
+  "16CA7A47AAE4BE49B1E75A6B960C3875E945B264"   // Release
+};
+
 struct IconRepresentationInfo {
   // Size as a string that will be used to retrieve representation value from
   // SetIcon function arguments.
   const char* size_string;
   // Scale factor for which the represantion should be used.
   ui::ScaleFactor scale;
 };
 
 const IconRepresentationInfo kIconSizes[] = {
     { "19", ui::SCALE_FACTOR_100P },
@@ skipping 129 matching lines @@
   registry->RegisterFunction<BrowserActionSetTitleFunction>();
   registry->RegisterFunction<BrowserActionSetBadgeTextFunction>();
   registry->RegisterFunction<BrowserActionSetBadgeBackgroundColorFunction>();
   registry->RegisterFunction<BrowserActionSetPopupFunction>();
   registry->RegisterFunction<BrowserActionGetTitleFunction>();
   registry->RegisterFunction<BrowserActionGetBadgeTextFunction>();
   registry->RegisterFunction<BrowserActionGetBadgeBackgroundColorFunction>();
   registry->RegisterFunction<BrowserActionGetPopupFunction>();
   registry->RegisterFunction<BrowserActionEnableFunction>();
   registry->RegisterFunction<BrowserActionDisableFunction>();
+  registry->RegisterFunction<BrowserActionOpenPopupFunction>();
 
   // Page Actions
   registry->RegisterFunction<EnablePageActionsFunction>();
   registry->RegisterFunction<DisablePageActionsFunction>();
   registry->RegisterFunction<PageActionShowFunction>();
   registry->RegisterFunction<PageActionHideFunction>();
   registry->RegisterFunction<PageActionSetIconFunction>();
   registry->RegisterFunction<PageActionSetTitleFunction>();
   registry->RegisterFunction<PageActionSetPopupFunction>();
   registry->RegisterFunction<PageActionGetTitleFunction>();
@@ skipping 576 matching lines @@
   list->Append(
       new base::FundamentalValue(static_cast<int>(SkColorGetG(color))));
   list->Append(
       new base::FundamentalValue(static_cast<int>(SkColorGetB(color))));
   list->Append(
       new base::FundamentalValue(static_cast<int>(SkColorGetA(color))));
   SetResult(list);
   return true;
 }
 
+bool BrowserActionOpenPopupFunction::RunImpl() {
+  if (VersionInfo::GetChannel() != VersionInfo::CHANNEL_UNKNOWN &&

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

For clarity, suggest adding a private boolean method to check the whitelist

[Matt Perry, 2013/10/11 22:22:53]

We actually have a standard mechanism for this. Add browserAction.openPopup to
_api_features.json with this right restrictions/whitelists.

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

Done.

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

Just using _api_features.json now.

+      VersionInfo::GetChannel() != VersionInfo::CHANNEL_DEV &&
+      !SimpleFeature::IsIdInWhitelist(
+          extension_->id(),
+          std::set<std::string>(

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

Is this an overloaded ctor for std::set that takes a char*[]?  Not familiar with
it, but cool if it works.

+              whitelisted_extensions,
+              whitelisted_extensions + arraysize(whitelisted_extensions)))) {
+    SetResult(new base::DictionaryValue());
+    return false;
+  }
+
+  ExtensionService* service =
+      extensions::ExtensionSystem::Get(profile_)->extension_service();
+  if (!service) {
+    SetResult(new base::DictionaryValue());

[Matt Perry, 2013/10/11 22:22:53]

Don't set result on errors. Use SetError instead, with a reasonable error
message (though this is just likely to be "internal error").

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

Done.

+    return false;
+  }
+
+  ExtensionToolbarModel *model = service->toolbar_model();
+  if (!model) {
+    SetResult(new base::DictionaryValue());
+    return false;
+  }
+
+  model->ShowBrowserActionPopup(extension_);
+
+  SetResult(new base::DictionaryValue());

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

Just call this at the top of RunImpl?

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

no longer needed.

+  return true;
+}
+
 //
 // ScriptBadgeGetAttentionFunction
 //
 
 ScriptBadgeGetAttentionFunction::~ScriptBadgeGetAttentionFunction() {}
 
 bool ScriptBadgeGetAttentionFunction::RunExtensionAction() {
   tab_helper().location_bar_controller()->GetAttentionFor(extension_id());
   return true;
 }
@@ skipping 66 matching lines @@
   return true;
 }
 
 bool EnablePageActionsFunction::RunImpl() {
   return SetPageActionEnabled(true);
 }
 
 bool DisablePageActionsFunction::RunImpl() {
   return SetPageActionEnabled(false);
 }