Initial skeleton for System Indicator API

chrome/common/extensions/extension.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/common/extensions/extension.h"
 
 #include <ostream>
 
 #include "base/base64.h"
 #include "base/basictypes.h"
@@ skipping 2168 matching lines @@
       if (!LoadFileHandler(*iter, *handler, error))
         return false;
     } else {
       *error = ASCIIToUTF16(errors::kInvalidFileHandlers);
       return false;
     }
   }
   return true;
 }
 
-bool Extension::LoadExtensionFeatures(const APIPermissionSet& api_permissions,
+bool Extension::LoadExtensionFeatures(APIPermissionSet* api_permissions,
                                       string16* error) {
   if (manifest_->HasKey(keys::kConvertedFromUserScript))
     manifest_->GetBoolean(keys::kConvertedFromUserScript,
                           &converted_from_user_script_);
 
   if (!LoadDevToolsPage(error) ||
-      !LoadInputComponents(api_permissions, error) ||
+      !LoadInputComponents(*api_permissions, error) ||
       !LoadContentScripts(error) ||
       !LoadPageAction(error) ||
       !LoadBrowserAction(error) ||
+      !LoadSystemIndicator(api_permissions, error) ||
       !LoadScriptBadge(error) ||
       !LoadFileBrowserHandlers(error) ||
       !LoadChromeURLOverrides(error) ||
       !LoadOmnibox(error) ||
       !LoadTextToSpeechVoices(error) ||
       !LoadIncognitoMode(error) ||
       !LoadFileHandlers(error) ||
       !LoadContentSecurityPolicy(error))
     return false;
 
@@ skipping 226 matching lines @@
     return false;
   }
 
   browser_action_info_ = LoadExtensionActionInfoHelper(
       browser_action_value, Extension::ActionInfo::TYPE_BROWSER, error);
   if (!browser_action_info_.get())
     return false;  // Failed to parse browser action definition.
   return true;
 }
 
+bool Extension::LoadSystemIndicator(APIPermissionSet* api_permissions,
+                                    string16* error) {
+  if (!manifest_->HasKey(keys::kSystemIndicator)) {
+    // There was no manifest entry for the system indicator.
+    return true;
+  }
+
+  DictionaryValue* system_indicator_value = NULL;
+  if (!manifest_->GetDictionary(keys::kSystemIndicator,
+                                &system_indicator_value)) {
+    *error = ASCIIToUTF16(errors::kInvalidSystemIndicator);
+    return false;
+  }
+
+  system_indicator_info_ = LoadExtensionActionInfoHelper(
+      system_indicator_value,
+      Extension::ActionInfo::TYPE_SYSTEM_INDICATOR,
+      error);
+
+  if (!system_indicator_info_.get()) {
+    return false;
+  }
+
+  // Because the manifest was successfully parsed, auto-grant the permission.
+  api_permissions->insert(APIPermission::kSystemIndicator);

[not at google - send to devlin, 2012/11/21 23:39:23]

TODO(dewittj): do this for all extension action APIs.

[dewittj, 2012/11/26 18:32:58]

Done.

+
+  return true;
+}
+
 bool Extension::LoadScriptBadge(string16* error) {
   if (manifest_->HasKey(keys::kScriptBadge)) {
     if (!FeatureSwitch::script_badges()->IsEnabled()) {
       // So as to not confuse developers if they specify a script badge section
       // in the manifest, show a warning if the script badge declaration isn't
       // going to have any effect.
       install_warnings_.push_back(
           InstallWarning(InstallWarning::FORMAT_TEXT,
                          errors::kScriptBadgeRequiresFlag));
     }
@@ skipping 801 matching lines @@
                         &optional_host_permissions)) {
     return false;
   }
 
   if (!LoadAppIsolation(api_permissions, error))
     return false;
 
   if (!LoadSharedFeatures(api_permissions, error))
     return false;
 
-  if (!LoadExtensionFeatures(api_permissions, error))
+  if (!LoadExtensionFeatures(&api_permissions, error))
     return false;
 
   if (!LoadThemeFeatures(error))
     return false;
 
   if (HasMultipleUISurfaces()) {
     *error = ASCIIToUTF16(errors::kOneUISurfaceOnly);
     return false;
   }
 
@@ skipping 817 matching lines @@
 
 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
     const Extension* extension,
     const PermissionSet* permissions,
     Reason reason)
     : reason(reason),
       extension(extension),
       permissions(permissions) {}
 
 }   // namespace extensions