diff options
| author | sdefresne <sdefresne@chromium.org> | 2015-10-28 02:45:47 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-28 09:46:29 +0000 |
| commit | df7072d1ae6dbb8963a66e3b6fe943ca778a7c1c (patch) | |
| tree | 453be5ec4c08b8d963b7141477cdc8f1fa5bd831 /ios | |
| parent | 15def759c78af058a91b9c7b48fef6eb862537f1 (diff) | |
| download | chromium_src-df7072d1ae6dbb8963a66e3b6fe943ca778a7c1c.zip chromium_src-df7072d1ae6dbb8963a66e3b6fe943ca778a7c1c.tar.gz chromium_src-df7072d1ae6dbb8963a66e3b6fe943ca778a7c1c.tar.bz2 | |
[iOS] Export kDummyExtensionScheme through chrome_url_constants.{h,cc}.
BUG=547725
Review URL: https://codereview.chromium.org/1406973003
Cr-Commit-Position: refs/heads/master@{#356528}
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/chrome/browser/chrome_url_constants.cc | 1 | ||||
| -rw-r--r-- | ios/chrome/browser/chrome_url_constants.h | 1 | ||||
| -rw-r--r-- | ios/chrome/browser/content_settings/cookie_settings_factory.cc | 5 |
3 files changed, 3 insertions, 4 deletions
diff --git a/ios/chrome/browser/chrome_url_constants.cc b/ios/chrome/browser/chrome_url_constants.cc index 027fc83..f3e7890 100644 --- a/ios/chrome/browser/chrome_url_constants.cc +++ b/ios/chrome/browser/chrome_url_constants.cc @@ -7,6 +7,7 @@ #include "base/macros.h" const char kChromeUIScheme[] = "chrome"; +const char kDummyExtensionScheme[] = ":no-extension-scheme:"; const char kChromeUIBookmarksURL[] = "chrome://bookmarks/"; const char kChromeUIChromeURLsURL[] = "chrome://chrome-urls/"; diff --git a/ios/chrome/browser/chrome_url_constants.h b/ios/chrome/browser/chrome_url_constants.h index a8444e9..9a93b2b 100644 --- a/ios/chrome/browser/chrome_url_constants.h +++ b/ios/chrome/browser/chrome_url_constants.h @@ -17,6 +17,7 @@ // kChromeUIScheme defined in content/public/common/url_constants.h until Chrome // on iOS stops depending on //content downstream. extern const char kChromeUIScheme[]; +extern const char kDummyExtensionScheme[]; // chrome: URLs (including schemes). Should be kept in sync with the // URL components below. diff --git a/ios/chrome/browser/content_settings/cookie_settings_factory.cc b/ios/chrome/browser/content_settings/cookie_settings_factory.cc index e271098..4181ea0 100644 --- a/ios/chrome/browser/content_settings/cookie_settings_factory.cc +++ b/ios/chrome/browser/content_settings/cookie_settings_factory.cc @@ -8,13 +8,10 @@ #include "components/content_settings/core/browser/cookie_settings.h" #include "components/keyed_service/ios/browser_state_dependency_manager.h" #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h" +#include "ios/chrome/browser/chrome_url_constants.h" #include "ios/chrome/browser/content_settings/host_content_settings_map_factory.h" #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h" -namespace { -const char kDummyExtensionScheme[] = ":no-extension-scheme:"; -} - namespace ios { // static |