Removes the dependency to WMTestHelper from app shell.

apps/shell/browser/shell_desktop_controller.h

 // 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.
 
 #ifndef APPS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_
 #define APPS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
+#include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/window_tree_host_observer.h"
 #include "ui/gfx/geometry/size.h"

[oshima, 2014/05/30 16:22:51]

nit: this can be forward decl, i thin.

[Jun Mukai, 2014/05/30 19:57:47]

Done.

 
 #if defined(OS_CHROMEOS)
 #include "ui/display/chromeos/display_configurator.h"
 #endif
 
 namespace aura {
 class TestScreen;
+class Window;
 class WindowTreeHost;
+namespace client {
+class DefaultCaptureClient;
+class FocusClient;
+}
 }
 
 namespace content {
 class BrowserContext;
 }
 
 #if defined(OS_CHROMEOS)
 namespace ui {
 class UserActivityPowerManagerNotifier;
 }
 #endif
 
 namespace wm {
 class CursorManager;
+class CompoundEventFilter;

[James Cook, 2014/05/30 17:30:18]

nit: alphabetize

[Jun Mukai, 2014/05/30 19:57:47]

Done.

+class InputMethodEventFilter;
 class UserActivityDetector;
-class WMTestHelper;
 }
 
 namespace apps {
 
 class ShellAppWindow;
 
 // Handles desktop-related tasks for app_shell.
-class ShellDesktopController
+class ShellDesktopController : public aura::client::WindowTreeClient,
 #if defined(OS_CHROMEOS)
-    : public ui::DisplayConfigurator::Observer
+                               public ui::DisplayConfigurator::Observer,
 #endif
-      {
+                               public aura::WindowTreeHostObserver {

[oshima, 2014/05/30 16:22:51]

nit: move WTHO before ui::DisplayConfigurator::Observer

[Jun Mukai, 2014/05/30 19:57:47]

Done.

  public:
   ShellDesktopController();
   virtual ~ShellDesktopController();
 
   // Returns the single instance of the desktop. (Stateless functions like
   // ShellAppWindowCreateFunction need to be able to access the desktop, so
   // we need a singleton somewhere).
   static ShellDesktopController* instance();
 
+  // Creates the window that hosts the app.
+  void CreateRootWindow();
+
   // Creates a new app window and adds it to the desktop. The desktop maintains
   // ownership of the window.
   ShellAppWindow* CreateAppWindow(content::BrowserContext* context);
 
   // Closes and destroys the app window.
   void CloseAppWindow();
 
-  // Returns the host for the Aura window tree.
-  aura::WindowTreeHost* GetWindowTreeHost();
+  // Overridden from aura::client::WindowTreeClient:
+  virtual aura::Window* GetDefaultParent(aura::Window* context,
+                                         aura::Window* window,
+                                         const gfx::Rect& bounds) OVERRIDE;
 
 #if defined(OS_CHROMEOS)
   // ui::DisplayConfigurator::Observer overrides.
   virtual void OnDisplayModeChanged(const std::vector<
       ui::DisplayConfigurator::DisplayState>& displays) OVERRIDE;
 #endif
 
+  // aura::WindowTreeHostObserver overrides:
+  virtual void OnHostCloseRequested(const aura::WindowTreeHost* host) OVERRIDE;
+
+  aura::WindowTreeHost* host() {

[James Cook, 2014/05/30 17:30:18]

optional nit: move up near instance() because it is a simple getter

[Jun Mukai, 2014/05/30 19:57:47]

Done.

+    return host_.get();
+  };
+
+ protected:
+  // Creates and sets the aura clients and window manager stuffs. Subclass may

[James Cook, 2014/05/30 17:30:18]

nit: stuffs -> stuff

[Jun Mukai, 2014/05/30 19:57:47]

Done.

+  // initialize different sets of the clients.
+  virtual void InitWindowManager();
+
  private:
-  // Creates the window that hosts the app.
-  void CreateRootWindow();
-
   // Closes and destroys the root window hosting the app.
   void DestroyRootWindow();
 
   // Returns the dimensions (in pixels) of the primary display, or an empty size
   // if the dimensions can't be determined or no display is connected.
   gfx::Size GetPrimaryDisplaySize();
 
 #if defined(OS_CHROMEOS)
   scoped_ptr<ui::DisplayConfigurator> display_configurator_;
 #endif
 
-  // Enable a minimal set of views::corewm to be initialized.
-  scoped_ptr<wm::WMTestHelper> wm_test_helper_;
+  scoped_ptr<aura::TestScreen> test_screen_;
 
-  scoped_ptr<aura::TestScreen> test_screen_;
+  scoped_ptr<aura::WindowTreeHost> host_;
+
+  scoped_ptr<wm::CompoundEventFilter> root_window_event_filter_;
+
+  scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
+
+  scoped_ptr<wm::InputMethodEventFilter> input_method_filter_;
+
+  scoped_ptr<aura::client::FocusClient> focus_client_;
 
   scoped_ptr<wm::CursorManager> cursor_manager_;
 
   scoped_ptr<wm::UserActivityDetector> user_activity_detector_;
 #if defined(OS_CHROMEOS)
   scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_;
 #endif
 
   // The desktop supports a single app window.
   scoped_ptr<ShellAppWindow> app_window_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellDesktopController);
 };
 
 }  // namespace apps
 
 #endif  // APPS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_