Introduce 'grab_inputs' property for athena container.

athena/test/athena_test_helper.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 "athena/test/athena_test_helper.h"
 
 #include "athena/main/athena_launcher.h"
+#include "athena/screen/public/screen_manager.h"
 #include "athena/test/sample_activity_factory.h"
 #include "athena/test/test_app_model_builder.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"
 #include "ui/aura/input_state_lookup.h"
 #include "ui/aura/test/env_test_helper.h"
 #include "ui/aura/test/test_focus_client.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/ime/input_method_initializer.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/gfx/screen.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"
 
 #if defined(USE_X11)
 #include "ui/base/x/x11_util.h"
 #endif
 
 namespace athena {
 namespace test {
 
 AthenaTestHelper::AthenaTestHelper(base::MessageLoopForUI* message_loop)
@@ skipping 30 matching lines @@
   const gfx::Size host_size(800, 600);
   test_screen_.reset(aura::TestScreen::Create(host_size));
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_.get());
   host_.reset(test_screen_->CreateHostForPrimaryDisplay());
 
   input_method_filter_.reset(new ::wm::InputMethodEventFilter(
       root_window()->GetHost()->GetAcceleratedWidget()));
   input_method_filter_->SetInputMethodPropertyInRootWindow(
       root_window());
 
-  // TODO(oshima): Switch to athena implementation.
-  focus_client_.reset(new aura::test::TestFocusClient);
-  aura::client::SetFocusClient(root_window(),
-                               focus_client_.get());
-  new ::wm::DefaultActivationClient(root_window());
+  wm::FocusController* focus_controller =
+      new wm::FocusController(ScreenManager::CreateFocusRules());
+  aura::client::SetFocusClient(root_window(), focus_controller);
+  root_window()->AddPreTargetHandler(focus_controller);
+  aura::client::SetActivationClient(root_window(), focus_controller);
+  focus_client_.reset(focus_controller);
 
   root_window()->Show();
   // Ensure width != height so tests won't confuse them.
   host()->SetBounds(gfx::Rect(host_size));
 
   athena::StartAthena(root_window(),
                       new SampleActivityFactory(),
                       new TestAppModelBuilder());
 }
 
@@ skipping 22 matching lines @@
 
 void AthenaTestHelper::RunAllPendingInMessageLoop() {
   // TODO(jbates) crbug.com/134753 Find quitters of this RunLoop and have them
   //              use run_loop.QuitClosure().
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
 }
 
 }  // namespace test
 }  // namespace athena