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

extensions/shell/browser/shell_app_window_client.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 "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"
+
+#if defined(USE_AURA)
+#include "extensions/shell/browser/shell_native_app_window_aura.h"
+#endif
 
 namespace extensions {
 
 ShellAppWindowClient::ShellAppWindowClient() {
 }
 
 ShellAppWindowClient::~ShellAppWindowClient() {
 }
 
 AppWindow* ShellAppWindowClient::CreateAppWindow(
     content::BrowserContext* context,
     const Extension* extension) {
   return DesktopController::instance()->CreateAppWindow(context, extension);
 }
 
+#if defined(USE_AURA)
 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;
 }
+#endif  // USE_AURA
 
 void ShellAppWindowClient::OpenDevToolsWindow(
     content::WebContents* web_contents,
     const base::Closure& callback) {
   NOTIMPLEMENTED();
 }
 
 bool ShellAppWindowClient::IsCurrentChannelOlderThanDev() {
   return false;
 }
 
 }  // namespace extensions