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

Unified Diff: chrome/common/extensions/extension.cc

Issue 7917006: Extension loading extracts intents from Manifest data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed includes for moved headers Created 9 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
« no previous file with comments | « chrome/common/extensions/extension.h ('k') | chrome/common/extensions/extension_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/extension.cc
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index af1f538d9c90bcce2b30774aa5c26c33a8de308e..e595749d88d0a3543dee3a15f3bfe8f0875d7870 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -44,6 +44,7 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "webkit/glue/image_decoder.h"
+#include "webkit/glue/web_intent_service_data.h"
namespace keys = extension_manifest_keys;
namespace values = extension_manifest_values;
@@ -1162,6 +1163,74 @@ bool Extension::LoadAppIsolation(const DictionaryValue* manifest,
return true;
}
+bool Extension::LoadWebIntents(const base::DictionaryValue& manifest,
+ std::string* error) {
+ DCHECK(error);
+
+ if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableWebIntents))
+ return true;
+
+ if (!manifest.HasKey(keys::kIntents))
+ return true;
+
+ DictionaryValue* all_intents = NULL;
+ if (!manifest.GetDictionary(keys::kIntents, &all_intents)) {
+ *error = errors::kInvalidIntents;
+ return false;
+ }
+
+ std::string value;
+ for (DictionaryValue::key_iterator iter(all_intents->begin_keys());
+ iter != all_intents->end_keys(); ++iter) {
+ WebIntentServiceData intent;
+
+ DictionaryValue* one_intent = NULL;
+ if (!all_intents->GetDictionaryWithoutPathExpansion(*iter, &one_intent)) {
+ *error = errors::kInvalidIntent;
+ return false;
+ }
+ intent.action = UTF8ToUTF16(*iter);
+
+ // TODO(groby): Support an array of types.
+ if (one_intent->HasKey(keys::kIntentType) &&
+ !one_intent->GetString(keys::kIntentType, &intent.type)) {
+ *error = errors::kInvalidIntentType;
+ return false;
+ }
+
+ if (one_intent->HasKey(keys::kIntentPath)) {
+ if (!one_intent->GetString(keys::kIntentPath, &value)) {
+ *error = errors::kInvalidIntentPath;
+ return false;
+ }
+ intent.service_url = GetResourceURL(value);
+ }
+
+ if (one_intent->HasKey(keys::kIntentTitle) &&
+ !one_intent->GetString(keys::kIntentTitle, &intent.title)) {
+ *error = errors::kInvalidIntentTitle;
+ return false;
+ }
+
+ if (one_intent->HasKey(keys::kIntentDisposition)) {
+ if (!one_intent->GetString(keys::kIntentDisposition, &value) ||
+ (value != values::kIntentDispositionWindow &&
+ value != values::kIntentDispositionInline)) {
+ *error = errors::kInvalidIntentDisposition;
+ return false;
+ }
+ if (value == values::kIntentDispositionInline)
+ intent.disposition = WebIntentServiceData::DISPOSITION_INLINE;
+ else
+ intent.disposition = WebIntentServiceData::DISPOSITION_WINDOW;
+ }
+
+ intents_.push_back(intent);
+ }
+ return true;
+}
+
+
bool Extension::EnsureNotHybridApp(const DictionaryValue* manifest,
std::string* error) {
if (web_extent().is_empty())
@@ -2272,6 +2341,10 @@ bool Extension::InitFromValue(const DictionaryValue& source, int flags,
}
}
+ // Initialize web intents (optional).
+ if (!LoadWebIntents(source, error))
+ return false;
+
// Initialize incognito behavior. Apps default to split mode, extensions
// default to spanning.
incognito_split_mode_ = is_app();
« no previous file with comments | « chrome/common/extensions/extension.h ('k') | chrome/common/extensions/extension_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698