diff options
| author | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 02:32:52 +0000 |
|---|---|---|
| committer | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 02:32:52 +0000 |
| commit | b07ad52b08d16ce698ff224c3bd8d8d724b20c45 (patch) | |
| tree | 9adc1cce88a8367a41a962e74b5e2ae635abf2fa /chrome | |
| parent | 10689cad247866a32bf4d654d265700340f4a2a7 (diff) | |
| download | chromium_src-b07ad52b08d16ce698ff224c3bd8d8d724b20c45.zip chromium_src-b07ad52b08d16ce698ff224c3bd8d8d724b20c45.tar.gz chromium_src-b07ad52b08d16ce698ff224c3bd8d8d724b20c45.tar.bz2 | |
Move web intents switch to content_switches.
R=jam@chromium.org
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/7821010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99292 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/content_settings/host_content_settings_map.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/ui/browser.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/options/content_settings_handler.cc | 1 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.cc | 3 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 1 |
5 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc index 16ad3a2..afdc751 100644 --- a/chrome/browser/content_settings/host_content_settings_map.cc +++ b/chrome/browser/content_settings/host_content_settings_map.cc @@ -26,6 +26,7 @@ #include "chrome/common/url_constants.h" #include "content/browser/browser_thread.h" #include "content/browser/user_metrics.h" +#include "content/common/content_switches.h" #include "content/common/notification_service.h" #include "content/common/notification_source.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 935ee68..0775e37 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -133,6 +133,7 @@ #include "content/browser/tab_contents/tab_contents_view.h" #include "content/browser/user_metrics.h" #include "content/common/content_restriction.h" +#include "content/common/content_switches.h" #include "content/common/notification_service.h" #include "content/common/page_transition_types.h" #include "content/common/page_zoom.h" diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc index 365b07d..b92be0b 100644 --- a/chrome/browser/ui/webui/options/content_settings_handler.cc +++ b/chrome/browser/ui/webui/options/content_settings_handler.cc @@ -28,6 +28,7 @@ #include "chrome/common/url_constants.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/content_notification_types.h" +#include "content/common/content_switches.h" #include "content/common/notification_service.h" #include "content/common/notification_source.h" #include "grit/generated_resources.h" diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 5f120ac..dfab776 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -557,9 +557,6 @@ const char kEnableVerticalTabs[] = "enable-vertical-tabs"; // Order of the listed sub-arguments does not matter. const char kEnableWatchdog[] = "enable-watchdog"; -// Enable Web Intents. -const char kEnableWebIntents[] = "enable-web-intents"; - // Use WebSocket over SPDY. const char kEnableWebSocketOverSpdy[] = "enable-websocket-over-spdy"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 62a3d37..72768bc 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -161,7 +161,6 @@ extern const char kEnableTcpFastOpen[]; extern const char kEnableTopSites[]; extern const char kEnableVerticalTabs[]; extern const char kEnableWatchdog[]; -extern const char kEnableWebIntents[]; extern const char kEnableWebSocketOverSpdy[]; extern const char kEnableWebUITaskManager[]; extern const char kExperimentalSpellcheckerFeatures[]; |