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

extensions/shell/browser/shell_desktop_controller_aura.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 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>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "extensions/shell/browser/desktop_controller.h"
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/window_tree_host_observer.h"
 
@@ skipping 31 matching lines @@
 class CursorManager;
 class InputMethodEventFilter;
 class UserActivityDetector;
 }
 
 namespace extensions {
 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;
 
   // aura::client::WindowTreeClient overrides:
   aura::Window* GetDefaultParent(aura::Window* context,
                                  aura::Window* window,
                                  const gfx::Rect& bounds) override;
 
 #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:
   void OnHostCloseRequested(const aura::WindowTreeHost* host) override;
 
  protected:
   // Creates and sets the aura clients and window manager stuff. Subclass may
   // initialize different sets of the clients.
   virtual void InitWindowManager();
 
@@ skipping 29 matching lines @@
   scoped_ptr<wm::UserActivityDetector> user_activity_detector_;
 #if defined(OS_CHROMEOS)
   scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_;
 #endif
 
   scoped_ptr<AppWindowClient> app_window_client_;
 
   // 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_