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

extensions/shell/browser/shell_app_window_client_aura.cc

Index: extensions/shell/browser/shell_app_window_client_aura.cc
diff --git a/extensions/shell/browser/shell_app_window_client.cc b/extensions/shell/browser/shell_app_window_client_aura.cc
similarity index 51%
copy from extensions/shell/browser/shell_app_window_client.cc
copy to extensions/shell/browser/shell_app_window_client_aura.cc
index 293f58b91c7dc427f5c2bc6f0638ef2a2daafaad..af63f278b059e95d1eae16049afa7e1f2052596f 100644
--- a/extensions/shell/browser/shell_app_window_client.cc
+++ b/extensions/shell/browser/shell_app_window_client_aura.cc
@@ -4,44 +4,20 @@
 
 #include "extensions/shell/browser/shell_app_window_client.h"
 
-#include <vector>
-
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/shell/browser/desktop_controller.h"
-#include "extensions/shell/browser/shell_native_app_window.h"
+#include "extensions/shell/browser/shell_native_app_window_aura.h"
 
 namespace extensions {
 
-ShellAppWindowClient::ShellAppWindowClient() {
-}
-
-ShellAppWindowClient::~ShellAppWindowClient() {
-}
-
-AppWindow* ShellAppWindowClient::CreateAppWindow(
-    content::BrowserContext* context,
-    const Extension* extension) {
-  return DesktopController::instance()->CreateAppWindow(context, extension);
-}
-
 NativeAppWindow* ShellAppWindowClient::CreateNativeAppWindow(
       AppWindow* window,
       AppWindow::CreateParams* params) {
   ShellNativeAppWindow* native_app_window =
-      new ShellNativeAppWindow(window, *params);
+      new ShellNativeAppWindowAura(window, *params);
   DesktopController::instance()->AddAppWindow(
       native_app_window->GetNativeWindow());
   return native_app_window;
 }
 
-void ShellAppWindowClient::OpenDevToolsWindow(
-    content::WebContents* web_contents,
-    const base::Closure& callback) {
-  NOTIMPLEMENTED();
-}
-
-bool ShellAppWindowClient::IsCurrentChannelOlderThanDev() {
-  return false;
-}
-
 }  // namespace extensions