diff options
| author | aruslan@chromium.org <aruslan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-22 03:37:22 +0000 |
|---|---|---|
| committer | aruslan@chromium.org <aruslan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-22 03:37:22 +0000 |
| commit | 57e67ac2893ee64d012ec8cc2342ba50ccd661db (patch) | |
| tree | e5c77f9059c38e4bc20ee3060ca519ff48b8cb52 | |
| parent | 66276f7d081483a16f308b9dbafbb67170893400 (diff) | |
| download | chromium_src-57e67ac2893ee64d012ec8cc2342ba50ccd661db.zip chromium_src-57e67ac2893ee64d012ec8cc2342ba50ccd661db.tar.gz chromium_src-57e67ac2893ee64d012ec8cc2342ba50ccd661db.tar.bz2 | |
Enable autofill dialog codepath on Android.
Note that it will crash on Android if the user initiates an autocomplete
action on a rAc-enabled web-page.
There is a subseqent CL that sets up an empty shell to avoid crashes.
BUG=177508
Review URL: https://chromiumcodereview.appspot.com/12330059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183997 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/common.gypi | 12 | ||||
| -rw-r--r-- | chrome/browser/about_flags.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/chrome_render_process_observer.cc | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/build/common.gypi b/build/common.gypi index 605cd55..d923b6c 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -333,6 +333,9 @@ # disabling depends on the platform. 'enable_themes%': 1, + # Enables autofill dialog and associated features; disabled by default. + 'enable_autofill_dialog%' : 0, + # Uses OEM-specific wallpaper resources on Chrome OS. 'use_oem_wallpaper%': 0, @@ -491,6 +494,11 @@ 'remoting%': 0, }], + # Enable autofill dialog for Android and Views-enabled platforms for now. + ['toolkit_views==1 or (OS=="android" and android_build_type==0)', { + 'enable_autofill_dialog%': 1 + }], + ['OS=="android" and android_build_type==0', { 'enable_webrtc%': 1, }], @@ -712,6 +720,7 @@ 'enable_plugins%': '<(enable_plugins)', 'enable_session_service%': '<(enable_session_service)', 'enable_themes%': '<(enable_themes)', + 'enable_autofill_dialog%': '<(enable_autofill_dialog)', 'use_oem_wallpaper%': '<(use_oem_wallpaper)', 'enable_background%': '<(enable_background)', 'linux_use_gold_binary%': '<(linux_use_gold_binary)', @@ -1979,6 +1988,9 @@ ['enable_themes==1', { 'defines': ['ENABLE_THEMES=1'], }], + ['enable_autofill_dialog==1', { + 'defines': ['ENABLE_AUTOFILL_DIALOG=1'], + }], ['enable_background==1', { 'defines': ['ENABLE_BACKGROUND=1'], }], diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 14c1b0c..de5fe2b 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -1224,7 +1224,7 @@ const Experiment kExperiments[] = { "enable-interactive-autocomplete", IDS_FLAGS_ENABLE_INTERACTIVE_AUTOCOMPLETE_NAME, IDS_FLAGS_ENABLE_INTERACTIVE_AUTOCOMPLETE_DESCRIPTION, - kOsWin | kOsCrOS, + kOsWin | kOsCrOS | kOsAndroid, SINGLE_VALUE_TYPE(switches::kEnableInteractiveAutocomplete) }, #if defined(USE_AURA) diff --git a/chrome/renderer/chrome_render_process_observer.cc b/chrome/renderer/chrome_render_process_observer.cc index 07ab3f9..4ca1cde 100644 --- a/chrome/renderer/chrome_render_process_observer.cc +++ b/chrome/renderer/chrome_render_process_observer.cc @@ -169,7 +169,7 @@ ChromeRenderProcessObserver::ChromeRenderProcessObserver( base::StatisticsRecorder::set_dump_on_exit(true); } -#if defined(TOOLKIT_VIEWS) +#if defined(ENABLE_AUTOFILL_DIALOG) WebRuntimeFeatures::enableRequestAutocomplete( command_line.HasSwitch(switches::kEnableInteractiveAutocomplete) || command_line.HasSwitch(switches::kEnableExperimentalWebKitFeatures)); |