diff options
| author | groby@chromium.org <groby@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-14 22:09:34 +0000 |
|---|---|---|
| committer | groby@chromium.org <groby@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-14 22:09:34 +0000 |
| commit | f9494523f1028e36ce3b7af11a59ddf4f80b658c (patch) | |
| tree | 0d60739b55e4e54572dff3037cc4e53a7a2bedab | |
| parent | d3faea5716b28d1b82449381c41f2a5f959d70eb (diff) | |
| download | chromium_src-f9494523f1028e36ce3b7af11a59ddf4f80b658c.zip chromium_src-f9494523f1028e36ce3b7af11a59ddf4f80b658c.tar.gz chromium_src-f9494523f1028e36ce3b7af11a59ddf4f80b658c.tar.bz2 | |
Merge 235009 "[rAC, OSX] OSX rAC off by default in stable/beta"
> [rAC, OSX] OSX rAC off by default in stable/beta
>
> Once more, making rAC off-by-default in stable/beta channels, while
> keeping it on by default in trunk/canary/dev.
>
> BUG=318330
> R=estade@chromium.org, thestig@chromium.org
>
> Review URL: https://codereview.chromium.org/68413007
TBR=groby@chromium.org
Review URL: https://codereview.chromium.org/73183002
git-svn-id: svn://svn.chromium.org/chrome/branches/1700/src@235240 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/renderer/chrome_render_process_observer.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/chrome/renderer/chrome_render_process_observer.cc b/chrome/renderer/chrome_render_process_observer.cc index aedfa4f..14b4928 100644 --- a/chrome/renderer/chrome_render_process_observer.cc +++ b/chrome/renderer/chrome_render_process_observer.cc @@ -23,6 +23,7 @@ #include "chrome/common/child_process_logging.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" +#include "chrome/common/chrome_version_info.h" #include "chrome/common/metrics/variations/variations_util.h" #include "chrome/common/net/net_resource_provider.h" #include "chrome/common/render_messages.h" @@ -266,8 +267,19 @@ ChromeRenderProcessObserver::ChromeRenderProcessObserver( } #if defined(ENABLE_AUTOFILL_DIALOG) +#if defined(OS_MACOSX) + bool enable_autofill = command_line.HasSwitch( + autofill::switches::kEnableInteractiveAutocomplete); + chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); + if (channel != chrome::VersionInfo::CHANNEL_BETA && + channel != chrome::VersionInfo::CHANNEL_STABLE) { + enable_autofill = !command_line.HasSwitch( + autofill::switches::kDisableInteractiveAutocomplete); + } +#else bool enable_autofill = !command_line.HasSwitch( autofill::switches::kDisableInteractiveAutocomplete); +#endif WebRuntimeFeatures::enableRequestAutocomplete( enable_autofill || command_line.HasSwitch(switches::kEnableExperimentalWebPlatformFeatures)); |