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

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

Issue 7917006: Extension loading extracts intents from Manifest data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review fixes 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 | « no previous file | chrome/common/extensions/extension.cc » ('j') | chrome/common/extensions/extension.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/extension.h
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
index 215912e26891398f51da5a237fa1c9a1c2296439..e05bf04921fa8404146ef79f28cd568f5629baf2 100644
--- a/chrome/common/extensions/extension.h
+++ b/chrome/common/extensions/extension.h
@@ -17,6 +17,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/synchronization/lock.h"
+#include "chrome/browser/intents/web_intent_data.h"
#include "chrome/common/extensions/extension_constants.h"
#include "chrome/common/extensions/extension_icon_set.h"
#include "chrome/common/extensions/extension_permission_set.h"
@@ -533,6 +534,7 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
bool incognito_split_mode() const { return incognito_split_mode_; }
bool offline_enabled() const { return offline_enabled_; }
const std::vector<TtsVoice>& tts_voices() const { return tts_voices_; }
+ const std::vector<WebIntentData>& intents() const { return intents_; }
bool wants_file_access() const { return wants_file_access_; }
int creation_flags() const { return creation_flags_; }
@@ -641,6 +643,8 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
std::string* error);
bool LoadAppIsolation(const base::DictionaryValue* manifest,
std::string* error);
+ bool LoadWebIntents(const base::DictionaryValue& manifest,
+ std::string* error);
bool EnsureNotHybridApp(const base::DictionaryValue* manifest,
std::string* error);
@@ -843,6 +847,9 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
// List of text-to-speech voices that this extension provides, if any.
std::vector<TtsVoice> tts_voices_;
+ // List of intents that this extension provides, if any.
+ std::vector<WebIntentData> intents_;
+
// Whether the extension has host permissions or user script patterns that
// imply access to file:/// scheme URLs (the user may not have actually
// granted it that access).
« no previous file with comments | « no previous file | chrome/common/extensions/extension.cc » ('j') | chrome/common/extensions/extension.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698