diff options
| author | kevers@chromium.org <kevers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-29 23:53:41 +0000 |
|---|---|---|
| committer | kevers@chromium.org <kevers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-29 23:53:41 +0000 |
| commit | e1b299bafe3bd77bc556fab2f238db6c7a4bb7bb (patch) | |
| tree | 15f265151d1bef6148876c906ef885d443c5823d /ui/keyboard/keyboard.cc | |
| parent | b94661f4a8c8dcc048ccd29e34eae6b554880d99 (diff) | |
| download | chromium_src-e1b299bafe3bd77bc556fab2f238db6c7a4bb7bb.zip chromium_src-e1b299bafe3bd77bc556fab2f238db6c7a4bb7bb.tar.gz chromium_src-e1b299bafe3bd77bc556fab2f238db6c7a4bb7bb.tar.bz2 | |
Reland a11y keyboard.
BUG=297132
Patch set 1 is the original CL:
https://codereview.chromium.org/137543002/
which broke tests on the memory bots. Path set 2 contains the fix for the test failure.
Review URL: https://codereview.chromium.org/148213010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247784 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/keyboard/keyboard.cc')
| -rw-r--r-- | ui/keyboard/keyboard.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/ui/keyboard/keyboard.cc b/ui/keyboard/keyboard.cc index 7825c79..d790127 100644 --- a/ui/keyboard/keyboard.cc +++ b/ui/keyboard/keyboard.cc @@ -65,8 +65,15 @@ class KeyboardWebUIControllerFactory : public content::WebUIControllerFactory { namespace keyboard { +static bool initialized = false; + +void ResetKeyboardForTesting() { + content::WebUIControllerFactory::UnregisterFactoryForTesting( + KeyboardWebUIControllerFactory::GetInstance()); + initialized = false; +} + void InitializeKeyboard() { - static bool initialized = false; if (initialized) return; initialized = true; |