diff options
| author | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-20 06:07:15 +0000 |
|---|---|---|
| committer | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-20 06:07:15 +0000 |
| commit | fcbbf082d9e87a7590617b402952d57bffb4daa2 (patch) | |
| tree | 7715f41b4d9a6c870bb37543e27267a57f85239e /ash/shell.cc | |
| parent | fded8f64311a991a8f0b00b78b399559083ba32c (diff) | |
| download | chromium_src-fcbbf082d9e87a7590617b402952d57bffb4daa2.zip chromium_src-fcbbf082d9e87a7590617b402952d57bffb4daa2.tar.gz chromium_src-fcbbf082d9e87a7590617b402952d57bffb4daa2.tar.bz2 | |
Initialize the InputMethod before the windows. Allow the status container to be activated.
R=yusukes@chromium.org
BUG=104192
TEST=With Aura enabled, tab through the status bar on the login screen
Review URL: https://chromiumcodereview.appspot.com/9264005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118413 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 40df7c9..0e9a14c 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -218,6 +218,12 @@ void Shell::DeleteInstance() { } void Shell::Init() { + // InputMethodEventFilter must be added first since it has the highest + // priority. + DCHECK(!GetRootWindowEventFilterCount()); + input_method_filter_.reset(new internal::InputMethodEventFilter); + AddRootWindowEventFilter(input_method_filter_.get()); + // On small screens we automatically enable --aura-window-mode=compact if the // user has not explicitly set a window mode flag. This must happen before // we create containers or layout managers. @@ -249,12 +255,6 @@ void Shell::Init() { // Force a layout. root_window->layout_manager()->OnWindowResized(); - // InputMethodEventFilter must be added first since it has the highest - // priority. - DCHECK(!GetRootWindowEventFilterCount()); - input_method_filter_.reset(new internal::InputMethodEventFilter); - AddRootWindowEventFilter(input_method_filter_.get()); - window_modality_controller_.reset(new internal::WindowModalityController); AddRootWindowEventFilter(window_modality_controller_.get()); |