summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorkoz@chromium.org <koz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-14 05:44:48 +0000
committerkoz@chromium.org <koz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-14 05:44:48 +0000
commit03fadb04a9ea228d7751916142d73a5237afb69a (patch)
tree789356df6df1d32de08305af249424a1f75e21c7 /chrome/common
parent9ae0bc01c3d8a09b6b2e1c11d0343a0caf2e2293 (diff)
downloadchromium_src-03fadb04a9ea228d7751916142d73a5237afb69a.zip
chromium_src-03fadb04a9ea228d7751916142d73a5237afb69a.tar.gz
chromium_src-03fadb04a9ea228d7751916142d73a5237afb69a.tar.bz2
Add unit test and 'ignore' functionality to ProtocolHandlerRegistry.
When we change the infobar to make use of this functionality it will make it feasible for sites to make registerProtocolHandler calls on load, instead of in response to a user action. BUG= TEST=Unit test provided. Review URL: http://codereview.chromium.org/6793014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81538 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/pref_names.cc13
-rw-r--r--chrome/common/pref_names.h2
2 files changed, 13 insertions, 2 deletions
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 04c6f3a6..2a022ec 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -1289,6 +1289,15 @@ const char kManagedPopupsBlockedForUrls[] =
// needs to acknowledge this page.
const char kKnownBackgroundPages[] = "background_pages.known";
-// Dictionary that maps URL schemes (protocols) to URL handlers.
-const char kRegisteredProtocolHandlers[] = "registered_protocol_handlers";
+// List of protocol handlers.
+const char kRegisteredProtocolHandlers[] =
+ "custom_handlers.registered_protocol_handlers";
+
+// List of protocol handlers the user has requested not to be asked about again.
+const char kIgnoredProtocolHandlers[] =
+ "custom_handlers.ignored_protocol_handlers";
+
+// Whether user-specified handlers for protocols and content types can be
+// specified.
+const char kCustomHandlersEnabled[] = "custom_handlers.enabled";
} // namespace prefs
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 32ad145..fd1da77 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -475,6 +475,8 @@ extern const char kGSSAPILibraryName[];
extern const char kKnownBackgroundPages[];
extern const char kRegisteredProtocolHandlers[];
+extern const char kIgnoredProtocolHandlers[];
+extern const char kCustomHandlersEnabled[];
} // namespace prefs