Refactor ShellDesktopController and ShellNativeAppWindow to allow for non-aura implementations.

extensions/shell/browser/shell_desktop_controller_aura.h

Index: extensions/shell/browser/shell_desktop_controller_aura.h
diff --git a/extensions/shell/browser/shell_desktop_controller.h b/extensions/shell/browser/shell_desktop_controller_aura.h
similarity index 76%
rename from extensions/shell/browser/shell_desktop_controller.h
rename to extensions/shell/browser/shell_desktop_controller_aura.h
index 2087234ac820053926e83c86d0bc975c898d4e22..964bd0458086b484e039f1312d7a707dbfd585ff 100644
--- a/extensions/shell/browser/shell_desktop_controller.h
+++ b/extensions/shell/browser/shell_desktop_controller_aura.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_
-#define EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_
+#ifndef EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_AURA_H_
+#define EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_AURA_H_
 
 #include <vector>
 
@@ -55,22 +55,23 @@ class AppWindowClient;
 class Extension;
 
 // Handles desktop-related tasks for app_shell.
-class ShellDesktopController : public DesktopController,
-                               public aura::client::WindowTreeClient,
+class ShellDesktopControllerAura
+    : public DesktopController,
+      public aura::client::WindowTreeClient,
 #if defined(OS_CHROMEOS)
-                               public chromeos::PowerManagerClient::Observer,
-                               public ui::DisplayConfigurator::Observer,
+      public chromeos::PowerManagerClient::Observer,
+      public ui::DisplayConfigurator::Observer,
 #endif
-                               public aura::WindowTreeHostObserver {
+      public aura::WindowTreeHostObserver {
  public:
-  ShellDesktopController();
-  ~ShellDesktopController() override;
+  ShellDesktopControllerAura();
+  ~ShellDesktopControllerAura() override;
 
   // DesktopController:
-  aura::WindowTreeHost* GetHost() override;
+  gfx::Size GetWindowSize() override;
   AppWindow* CreateAppWindow(content::BrowserContext* context,
                              const Extension* extension) override;
-  void AddAppWindow(aura::Window* window) override;
+  void AddAppWindow(gfx::NativeWindow window) override;
   void RemoveAppWindow(AppWindow* window) override;
   void CloseAppWindows() override;
 
@@ -81,13 +82,14 @@ class ShellDesktopController : public DesktopController,
 
 #if defined(OS_CHROMEOS)
   // chromeos::PowerManagerClient::Observer overrides:
-  virtual void PowerButtonEventReceived(bool down,
-                                        const base::TimeTicks& timestamp)
-      override;
+  virtual void PowerButtonEventReceived(

[James Cook, 2014/11/11 18:23:52]

nit: no virtual

[Yoyo Zhou, 2014/11/15 01:05:44]

Done.

+      bool down,
+      const base::TimeTicks& timestamp) override;
 
   // ui::DisplayConfigurator::Observer overrides.
-  virtual void OnDisplayModeChanged(const std::vector<
-      ui::DisplayConfigurator::DisplayState>& displays) override;
+  virtual void OnDisplayModeChanged(

[James Cook, 2014/11/11 18:23:52]

nit: no virtual

[Yoyo Zhou, 2014/11/15 01:05:44]

Done.

+      const std::vector<ui::DisplayConfigurator::DisplayState>& displays)
+      override;
 #endif
 
   // aura::WindowTreeHostObserver overrides:
@@ -137,9 +139,9 @@ class ShellDesktopController : public DesktopController,
   // NativeAppWindow::Close() deletes the AppWindow.
   std::vector<AppWindow*> app_windows_;
 
-  DISALLOW_COPY_AND_ASSIGN(ShellDesktopController);
+  DISALLOW_COPY_AND_ASSIGN(ShellDesktopControllerAura);
 };
 
 }  // namespace extensions
 
-#endif  // EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_
+#endif  // EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_AURA_H_