diff options
author | csharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-03 15:04:40 +0000 |
---|---|---|
committer | csharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-03 15:04:40 +0000 |
commit | 6aec8932ddfb5771d227a2103e93b9e67de2170a (patch) | |
tree | 719004e8e0a67a9e13d3815cb5d5eb7886730164 /chrome/browser/autofill | |
parent | 1f9fd547750a691719ec8ef27ce285c92d4f91e4 (diff) | |
download | chromium_src-6aec8932ddfb5771d227a2103e93b9e67de2170a.zip chromium_src-6aec8932ddfb5771d227a2103e93b9e67de2170a.tar.gz chromium_src-6aec8932ddfb5771d227a2103e93b9e67de2170a.tar.bz2 |
[Autofill] Remove IsNativeUiEnabled
The native UI is now always on and the flag to revert to the old
UI has been removed, so this will now always be true.
TBR=isherman@chromium.org
BUG=255625
Review URL: https://chromiumcodereview.appspot.com/18173006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209984 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autofill')
-rw-r--r-- | chrome/browser/autofill/autofill_browsertest.cc | 16 | ||||
-rw-r--r-- | chrome/browser/autofill/autofill_interactive_uitest.cc | 8 |
2 files changed, 6 insertions, 18 deletions
diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc index a269b64d..213e79d 100644 --- a/chrome/browser/autofill/autofill_browsertest.cc +++ b/chrome/browser/autofill/autofill_browsertest.cc @@ -232,11 +232,9 @@ class AutofillTest : public InProcessBrowserTest { AutofillDriverImpl* autofill_driver = AutofillDriverImpl::FromWebContents(web_contents); AutofillManager* autofill_manager = autofill_driver->autofill_manager(); - if (autofill_manager->IsNativeUiEnabled()) { - scoped_ptr<AutofillExternalDelegate> external_delegate( - new TestAutofillExternalDelegate(web_contents, autofill_manager)); - autofill_driver->SetAutofillExternalDelegate(external_delegate.Pass()); - } + scoped_ptr<AutofillExternalDelegate> external_delegate( + new TestAutofillExternalDelegate(web_contents, autofill_manager)); + autofill_driver->SetAutofillExternalDelegate(external_delegate.Pass()); autofill_manager->SetTestDelegate(&test_delegate_); } @@ -471,14 +469,6 @@ class AutofillTest : public InProcessBrowserTest { } void SendKeyToPopupAndWait(ui::KeyboardCode key) { - // TODO(isherman): Remove this condition once the WebKit popup UI code is - // removed. - if (!external_delegate()) { - // When testing the WebKit-based UI, route all keys to the page. - SendKeyToPageAndWait(key); - return; - } - // When testing the native UI, route popup-targeted key presses via the // external delegate. content::NativeWebKeyboardEvent event; diff --git a/chrome/browser/autofill/autofill_interactive_uitest.cc b/chrome/browser/autofill/autofill_interactive_uitest.cc index 50bfb1f..c040136 100644 --- a/chrome/browser/autofill/autofill_interactive_uitest.cc +++ b/chrome/browser/autofill/autofill_interactive_uitest.cc @@ -210,11 +210,9 @@ class AutofillInteractiveTest : public InProcessBrowserTest { AutofillDriverImpl* autofill_driver = AutofillDriverImpl::FromWebContents(web_contents); AutofillManager* autofill_manager = autofill_driver->autofill_manager(); - if (autofill_manager->IsNativeUiEnabled()) { - scoped_ptr<AutofillExternalDelegate> external_delegate( - new TestAutofillExternalDelegate(web_contents, autofill_manager)); - autofill_driver->SetAutofillExternalDelegate(external_delegate.Pass()); - } + scoped_ptr<AutofillExternalDelegate> external_delegate( + new TestAutofillExternalDelegate(web_contents, autofill_manager)); + autofill_driver->SetAutofillExternalDelegate(external_delegate.Pass()); autofill_manager->SetTestDelegate(&test_delegate_); } |