Fixes the initialization of focus and activation management.

apps/shell/browser/shell_desktop_controller.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "apps/shell/browser/shell_desktop_controller.h"
 
 #include "apps/shell/browser/shell_app_window.h"
 #include "content/public/browser/context_factory.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/cursor/image_cursors.h"
 #include "ui/base/ime/input_method_initializer.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/screen.h"
 #include "ui/wm/core/base_focus_rules.h"
 #include "ui/wm/core/compound_event_filter.h"
 #include "ui/wm/core/cursor_manager.h"
-#include "ui/wm/core/default_activation_client.h"
 #include "ui/wm/core/focus_controller.h"
 #include "ui/wm/core/input_method_event_filter.h"
 #include "ui/wm/core/native_cursor_manager.h"
 #include "ui/wm/core/native_cursor_manager_delegate.h"
 #include "ui/wm/core/user_activity_detector.h"
 
 #if defined(OS_CHROMEOS)
 #include "ui/chromeos/user_activity_power_manager_notifier.h"
 #include "ui/display/types/chromeos/display_mode.h"
 #include "ui/display/types/chromeos/display_snapshot.h"
@@ skipping 188 matching lines @@
   DCHECK_EQ(host_.get(), host);
   CloseAppWindow();
   base::MessageLoop::current()->PostTask(FROM_HERE,
                                          base::MessageLoop::QuitClosure());
 }
 
 void ShellDesktopController::CreateRootWindow() {
   test_screen_.reset(aura::TestScreen::Create());
   // TODO(jamescook): Replace this with a real Screen implementation.
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_.get());
-  // TODO(jamescook): Initialize a real input method.
-  ui::InitializeInputMethodForTesting();

[oshima, 2014/06/03 00:42:53]

can you check if app_shell_browsertests passes with this?

[Jun Mukai, 2014/06/03 00:57:46]

It passes.

+  // TODO(mukai): Set up input method.
 
   // Set up basic pieces of ui::wm.
   gfx::Size size = GetPrimaryDisplaySize();
   if (size.IsEmpty())
     size = gfx::Size(800, 600);
 
   host_.reset(aura::WindowTreeHost::Create(gfx::Rect(size)));
   host_->InitHost();
   aura::client::SetWindowTreeClient(host_->window(), this);
   root_window_event_filter_.reset(new wm::CompoundEventFilter);
   host_->window()->AddPreTargetHandler(root_window_event_filter_.get());
   InitWindowManager();
 
   host_->AddObserver(this);
 
   // Ensure the X window gets mapped.
   host_->Show();
 }
 
 void ShellDesktopController::InitWindowManager() {
-  focus_client_.reset(new wm::FocusController(new AppsFocusRules()));
-  aura::client::SetFocusClient(host_->window(), focus_client_.get());
+  wm::FocusController* focus_controller =
+      new wm::FocusController(new AppsFocusRules());
+  aura::client::SetFocusClient(host_->window(), focus_controller);
+  host_->window()->AddPreTargetHandler(focus_controller);
+  aura::client::SetActivationClient(host_->window(), focus_controller);
+  focus_client_.reset(focus_controller);
 
   input_method_filter_.reset(
       new wm::InputMethodEventFilter(host_->GetAcceleratedWidget()));
   input_method_filter_->SetInputMethodPropertyInRootWindow(host_->window());
   root_window_event_filter_->AddHandler(input_method_filter_.get());
 
-  new wm::DefaultActivationClient(host_->window());
-
   capture_client_.reset(
       new aura::client::DefaultCaptureClient(host_->window()));
 
   // Ensure new windows fill the display.
   host_->window()->SetLayoutManager(new FillLayout);
 
   cursor_manager_.reset(
       new wm::CursorManager(scoped_ptr<wm::NativeCursorManager>(
           new ShellNativeCursorManager(host_.get()))));
   cursor_manager_->SetDisplay(
@@ skipping 11 matching lines @@
 }
 
 void ShellDesktopController::DestroyRootWindow() {
   host_->RemoveObserver(this);
   if (input_method_filter_)
     root_window_event_filter_->RemoveHandler(input_method_filter_.get());
   if (user_activity_detector_) {
     host_->event_processor()->GetRootTarget()->RemovePreTargetHandler(
         user_activity_detector_.get());
   }
+  wm::FocusController* focus_controller =
+      static_cast<wm::FocusController*>(focus_client_.get());
+  if (focus_controller) {
+    host_->window()->RemovePreTargetHandler(focus_controller);
+    aura::client::SetActivationClient(host_->window(), NULL);
+  }
   root_window_event_filter_.reset();
   capture_client_.reset();
   input_method_filter_.reset();
   focus_client_.reset();
   cursor_manager_.reset();
 #if defined(OS_CHROMEOS)
   user_activity_notifier_.reset();
 #endif
   user_activity_detector_.reset();
   host_.reset();
-  ui::ShutdownInputMethodForTesting();
 }
 
 gfx::Size ShellDesktopController::GetPrimaryDisplaySize() {
 #if defined(OS_CHROMEOS)
   const std::vector<ui::DisplayConfigurator::DisplayState>& displays =
       display_configurator_->cached_displays();
   if (displays.empty())
     return gfx::Size();
   const ui::DisplayMode* mode = displays[0].display->current_mode();
   return mode ? mode->size() : gfx::Size();
 #else
   return gfx::Size();
 #endif
 }
 
 }  // namespace apps