diff options
| author | aurimas@chromium.org <aurimas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-22 18:00:00 +0000 |
|---|---|---|
| committer | aurimas@chromium.org <aurimas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-22 18:00:00 +0000 |
| commit | dc1cb7d8b1fc1a92a7ad22cf92316a0338787f5f (patch) | |
| tree | 497cc542d8d61971ba5adee060844c1c7f670ada | |
| parent | b86a94ed2d0e83f652855315d16b0c92cac233a3 (diff) | |
| download | chromium_src-dc1cb7d8b1fc1a92a7ad22cf92316a0338787f5f.zip chromium_src-dc1cb7d8b1fc1a92a7ad22cf92316a0338787f5f.tar.gz chromium_src-dc1cb7d8b1fc1a92a7ad22cf92316a0338787f5f.tar.bz2 | |
Revert "Disable intreactive autocomplete and remove command line flag for Android"
This reverts commit 410f01033302114f08bbd01b0bba915bd5eb6bf8.
Reverting the temporary removal of the interative autocomplete flag that was
needed to remove that flag from M28.
TBR=thakis
BUG=239478
Review URL: https://chromiumcodereview.appspot.com/15526004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201571 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/common.gypi | 2 | ||||
| -rw-r--r-- | chrome/browser/about_flags.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build/common.gypi b/build/common.gypi index e71eff0..2a01a66 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -501,7 +501,7 @@ }], # Enable autofill dialog for Android and Views-enabled platforms for now. - ['toolkit_views==1', { + ['toolkit_views==1 or (OS=="android" and android_webview_build==0)', { 'enable_autofill_dialog%': 1 }], diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 90e18fc..6836470 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -1241,7 +1241,7 @@ const Experiment kExperiments[] = { "enable-interactive-autocomplete", IDS_FLAGS_ENABLE_INTERACTIVE_AUTOCOMPLETE_NAME, IDS_FLAGS_ENABLE_INTERACTIVE_AUTOCOMPLETE_DESCRIPTION, - kOsWin | kOsCrOS, + kOsWin | kOsCrOS | kOsAndroid, ENABLE_DISABLE_VALUE_TYPE( autofill::switches::kEnableInteractiveAutocomplete, autofill::switches::kDisableInteractiveAutocomplete) |