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

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

Issue 11660016: Move the parsing of "chrome_url_overrides" out of Extension. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: patch-rebased Created 7 years, 11 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/browser/ui/webui/uber/uber_ui.cc ('k') | chrome/common/extensions/extension.cc » ('j') | no next file with comments »
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 007ad3661c3d1cb4c61cdd18d819b198725def98..3339c3ec08e3e264e5a7aa68b9f78315430329c4 100644
--- a/chrome/common/extensions/extension.h
+++ b/chrome/common/extensions/extension.h
@@ -62,7 +62,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
struct InstallWarning;
struct ManifestData;
- typedef std::map<const std::string, GURL> URLOverrideMap;
typedef std::vector<std::string> ScriptingWhitelist;
typedef std::vector<InstallWarning> InstallWarningVector;
typedef std::map<const std::string, linked_ptr<ManifestData> >
@@ -716,9 +715,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
return manifest_.get();
}
const std::string default_locale() const { return default_locale_; }
- const URLOverrideMap& GetChromeURLOverrides() const {
- return chrome_url_overrides_;
- }
bool incognito_split_mode() const { return incognito_split_mode_; }
bool offline_enabled() const { return offline_enabled_; }
const OAuth2Info& oauth2_info() const { return oauth2_info_; }
@@ -740,6 +736,7 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
bool is_extension() const;
bool is_storage_isolated() const { return is_storage_isolated_; }
bool can_be_incognito_enabled() const;
+ void AddWebExtentPattern(const URLPattern& pattern);
const URLPatternSet& web_extent() const { return extent_; }
const std::string& launch_local_path() const { return launch_local_path_; }
const std::string& launch_web_url() const { return launch_web_url_; }
@@ -893,7 +890,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
bool LoadBrowserAction(string16* error);
bool LoadScriptBadge(string16* error);
bool LoadSystemIndicator(APIPermissionSet* api_permissions, string16* error);
- bool LoadChromeURLOverrides(string16* error);
bool LoadTextToSpeechVoices(string16* error);
bool LoadIncognitoMode(string16* error);
bool LoadContentSecurityPolicy(string16* error);
@@ -1136,10 +1132,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
// Set to true at the end of InitValue when initialization is finished.
bool finished_parsing_manifest_;
- // A map of chrome:// hostnames (newtab, downloads, etc.) to Extension URLs
- // which override the handling of those URLs. (see ExtensionOverrideUI).
- URLOverrideMap chrome_url_overrides_;
-
// Whether this extension requests isolated storage.
bool is_storage_isolated_;
« no previous file with comments | « chrome/browser/ui/webui/uber/uber_ui.cc ('k') | chrome/common/extensions/extension.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698