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

2 files changed, 7 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());
 
diff --git a/ash/wm/activation_controller.cc b/ash/wm/activation_controller.cc
index 85d1c4f..4ebaa91 100644
--- a/ash/wm/activation_controller.cc
+++ b/ash/wm/activation_controller.cc
@@ -31,6 +31,7 @@ bool SupportsChildActivation(aura::Window* window) {
          window->id() == kShellWindowId_AlwaysOnTopContainer ||
          window->id() == kShellWindowId_PanelContainer ||
          window->id() == kShellWindowId_SystemModalContainer ||
+         window->id() == kShellWindowId_StatusContainer ||
          window->id() == kShellWindowId_LockScreenContainer ||
          window->id() == kShellWindowId_LockSystemModalContainer;
 }