summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-28 18:35:04 +0000
committerdbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-28 18:35:04 +0000
commitee019f9ac1690892d44b1b6492991bb4f3203869 (patch)
treeca53bd9c858d56b9fa77ecdc4b3d23ab74901360
parent3a73df2511a70563ea80185bc167bf27945e6086 (diff)
downloadchromium_src-ee019f9ac1690892d44b1b6492991bb4f3203869.zip
chromium_src-ee019f9ac1690892d44b1b6492991bb4f3203869.tar.gz
chromium_src-ee019f9ac1690892d44b1b6492991bb4f3203869.tar.bz2
Make rAc() disabled by default and require a flag to be turned on (again) for
all platforms. This CL is only for merging to M29 and will be reverted from trunk right after its merged. R=jam@chromium.org TEST=no rAc() by default on M29 BUG=254561 Review URL: https://codereview.chromium.org/18029016 git-svn-id: svn://svn.chromium.org/chrome/branches/1547/src@209199 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc4
-rw-r--r--chrome/renderer/chrome_render_process_observer.cc12
2 files changed, 7 insertions, 9 deletions
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
index d242fa1..a5647d5 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
@@ -188,6 +188,10 @@ class AutofillDialogControllerTest : public InProcessBrowserTest {
AutofillDialogControllerTest() {}
virtual ~AutofillDialogControllerTest() {}
+ virtual void SetUpCommandLine(CommandLine* cl) OVERRIDE {
+ cl->AppendSwitch(autofill::switches::kEnableInteractiveAutocomplete);
+ }
+
void InitializeControllerOfType(DialogType dialog_type) {
FormData form;
form.name = ASCIIToUTF16("TestForm");
diff --git a/chrome/renderer/chrome_render_process_observer.cc b/chrome/renderer/chrome_render_process_observer.cc
index 53fd038..242491f 100644
--- a/chrome/renderer/chrome_render_process_observer.cc
+++ b/chrome/renderer/chrome_render_process_observer.cc
@@ -261,16 +261,10 @@ ChromeRenderProcessObserver::ChromeRenderProcessObserver(
}
#if defined(ENABLE_AUTOFILL_DIALOG)
-#if defined(OS_MACOSX)
- bool enableAutofill = command_line.HasSwitch(
- autofill::switches::kEnableInteractiveAutocomplete);
-#else
- bool enableAutofill = !command_line.HasSwitch(
- autofill::switches::kDisableInteractiveAutocomplete);
-#endif
WebRuntimeFeatures::enableRequestAutocomplete(
- enableAutofill ||
- command_line.HasSwitch(switches::kEnableExperimentalWebKitFeatures));
+ command_line.HasSwitch(switches::kEnableExperimentalWebKitFeatures) ||
+ command_line.HasSwitch(
+ autofill::switches::kEnableInteractiveAutocomplete));
#endif
RenderThread* thread = RenderThread::Get();