Extend contextMenus API to support browser/page actions

chrome/browser/extensions/api/context_menus/context_menus_api_helpers.h

 // Copyright 2014 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.
 
 // Definition of helper functions for the ContextMenus API.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_CONTEXT_MENUS_CONTEXT_MENUS_API_HELPERS_H_
 #define CHROME_BROWSER_EXTENSIONS_API_CONTEXT_MENUS_CONTEXT_MENUS_API_HELPERS_H_
 
 #include "chrome/browser/extensions/menu_manager.h"
@@ skipping 25 matching lines @@
   return parent_id.Pass();
 }
 
 }  // namespace
 
 extern const char kCannotFindItemError[];
 extern const char kCheckedError[];
 extern const char kDuplicateIDError[];
 extern const char kGeneratedIdKey[];
 extern const char kLauncherNotAllowedError[];
+extern const char kActionNotAllowedError[];
 extern const char kOnclickDisallowedError[];
 extern const char kParentsMustBeNormalError[];
 extern const char kTitleNeededError[];
 
 std::string GetIDString(const MenuItem::Id& id);
 
 MenuItem* GetParent(MenuItem::Id parent_id,
                     const MenuManager* menu_manager,
                     std::string* error);
 
@@ skipping 26 matching lines @@
       case PropertyWithEnumT::CONTEXTS_TYPE_AUDIO:
         contexts.Add(extensions::MenuItem::AUDIO);
         break;
       case PropertyWithEnumT::CONTEXTS_TYPE_FRAME:
         contexts.Add(extensions::MenuItem::FRAME);
         break;
       case PropertyWithEnumT::CONTEXTS_TYPE_LAUNCHER:
         // Not available for <webview>.
         contexts.Add(extensions::MenuItem::LAUNCHER);
         break;
+      case PropertyWithEnumT::CONTEXTS_TYPE_BROWSER_ACTION:
+        // Not available for <webview>.
+        contexts.Add(extensions::MenuItem::BROWSER_ACTION);
+        break;
+      case PropertyWithEnumT::CONTEXTS_TYPE_PAGE_ACTION:
+        // Not available for <webview>.
+        contexts.Add(extensions::MenuItem::PAGE_ACTION);
+        break;
       case PropertyWithEnumT::CONTEXTS_TYPE_NONE:
         NOTREACHED();
     }
   }
   return contexts;
 }
 
 template<typename PropertyWithEnumT>
 MenuItem::Type GetType(const PropertyWithEnumT& property,
                        MenuItem::Type default_type) {
@@ skipping 42 matching lines @@
     contexts.Add(MenuItem::PAGE);
 
   if (contexts.Contains(MenuItem::LAUNCHER)) {
     // Launcher item is not allowed for <webview>.
     if (!extension->is_platform_app() || is_webview) {
       *error = kLauncherNotAllowedError;
       return false;
     }
   }
 
+  if (contexts.Contains(MenuItem::BROWSER_ACTION) ||
+      contexts.Contains(MenuItem::PAGE_ACTION)) {
+    // Action items are not allowed for <webview>.
+    if (!extension->is_platform_app() || is_webview) {

[Yoyo Zhou, 2014/07/24 00:17:58]

Actually, the comment above is not really clear. Launchers are available only to
apps. Browser and page actions are only available to extensions. So this should
be

if (!extension->is_extension() || is_webview)

[gpdavis, 2014/07/24 00:23:32]

Ah, I see.  I should have paid more attention to both of these.  Done.

+      *error = kActionNotAllowedError;
+      return false;
+    }
+  }
+
   // Title.
   std::string title;
   if (create_properties.title.get())
     title = *create_properties.title;
 
   MenuItem::Type type = GetType(create_properties, MenuItem::NORMAL);
   if (title.empty() && type != MenuItem::SEPARATOR) {
     *error = kTitleNeededError;
     return false;
   }
@@ skipping 138 matching lines @@
     return false;
 
   menu_manager->WriteToStorage(extension, item_id.extension_key);
   return true;
 }
 
 }  // namespace context_menus_api_helpers
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_CONTEXT_MENUS_CONTEXT_MENUS_API_HELPERS_H_