Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1100)

Unified Diff: chrome/common/extensions/manifest_handlers/extension_action_handler.cc

Issue 624453003: Clean up Extension Action Handlers Pt 1/2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/common/extensions/manifest_handlers/extension_action_handler.cc
diff --git a/chrome/common/extensions/manifest_handlers/extension_action_handler.cc b/chrome/common/extensions/manifest_handlers/extension_action_handler.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d812dae30f75eb0a3581fdab9432bd565f0b0971
--- /dev/null
+++ b/chrome/common/extensions/manifest_handlers/extension_action_handler.cc
@@ -0,0 +1,90 @@
+// 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.
+
+#include "chrome/common/extensions/manifest_handlers/extension_action_handler.h"
+
+#include "base/strings/utf_string_conversions.h"
+#include "base/values.h"
+#include "chrome/common/extensions/api/extension_action/action_info.h"
+#include "chrome/common/extensions/extension_constants.h"
+#include "chrome/grit/generated_resources.h"
+#include "extensions/common/extension.h"
+#include "extensions/common/file_util.h"
+#include "extensions/common/manifest_constants.h"
+
+namespace extensions {
+
+ExtensionActionHandler::ExtensionActionHandler() {
+}
+
+ExtensionActionHandler::~ExtensionActionHandler() {
+}
+
+bool ExtensionActionHandler::Parse(Extension* extension,
+ base::string16* error) {
+ const char* key = NULL;
+ const char* error_key = NULL;
+ if (extension->manifest()->HasKey(manifest_keys::kPageAction)) {
+ key = manifest_keys::kPageAction;
+ error_key = manifest_errors::kInvalidPageAction;
+ }
+
+ if (extension->manifest()->HasKey(manifest_keys::kBrowserAction)) {
+ if (key != NULL) {
+ // An extension cannot have both browser and page actions.
+ *error = base::ASCIIToUTF16(manifest_errors::kOneUISurfaceOnly);
+ return false;
+ }
+ key = manifest_keys::kBrowserAction;
+ error_key = manifest_errors::kInvalidBrowserAction;
+ }
+ DCHECK(key);
+
+ const base::DictionaryValue* dict = NULL;
+ if (!extension->manifest()->GetDictionary(key, &dict)) {
+ *error = base::ASCIIToUTF16(error_key);
+ return false;
+ }
+
+ scoped_ptr<ActionInfo> action_info = ActionInfo::Load(extension, dict, error);
+ if (!action_info)
+ return false; // Failed to parse browser action definition.
+
+ if (key == manifest_keys::kPageAction)
+ ActionInfo::SetPageActionInfo(extension, action_info.release());
+ else
+ ActionInfo::SetBrowserActionInfo(extension, action_info.release());
+
+ return true;
+}
+
+bool ExtensionActionHandler::Validate(
+ const Extension* extension,
+ std::string* error,
+ std::vector<InstallWarning>* warnings) const {
+ int error_message = 0;
+ const ActionInfo* action = ActionInfo::GetPageActionInfo(extension);
+ if (action) {
+ error_message = IDS_EXTENSION_LOAD_ICON_FOR_PAGE_ACTION_FAILED;
+ } else {
+ action = ActionInfo::GetBrowserActionInfo(extension);
+ error_message = IDS_EXTENSION_LOAD_ICON_FOR_BROWSER_ACTION_FAILED;
+ }
+
+ if (action && !action->default_icon.empty() &&
+ !file_util::ValidateExtensionIconSet(
+ action->default_icon, extension, error_message, error)) {
+ return false;
+ }
+ return true;
+}
+
+const std::vector<std::string> ExtensionActionHandler::Keys() const {
+ std::vector<std::string> keys;
+ keys.push_back(manifest_keys::kPageAction);
+ keys.push_back(manifest_keys::kBrowserAction);
+ return keys;
+}
+
+} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698