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

extensions/shell/browser/default_shell_browser_main_delegate.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/default_shell_browser_main_delegate.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/strings/string_tokenizer.h"
-#include "extensions/shell/browser/shell_desktop_controller.h"
 #include "extensions/shell/browser/shell_extension_system.h"
 #include "extensions/shell/common/switches.h"
 
+#if defined(USE_AURA)
+#include "extensions/shell/browser/shell_desktop_controller_aura.h"
+#endif
+
 namespace extensions {
 
 DefaultShellBrowserMainDelegate::DefaultShellBrowserMainDelegate() {
 }
 
 DefaultShellBrowserMainDelegate::~DefaultShellBrowserMainDelegate() {
 }
 
 void DefaultShellBrowserMainDelegate::Start(
     content::BrowserContext* browser_context) {
@@ skipping 21 matching lines @@
   } else {
     LOG(ERROR) << "--" << switches::kAppShellAppPath
                << " unset; boredom is in your future";
   }
 }
 
 void DefaultShellBrowserMainDelegate::Shutdown() {
 }
 
 DesktopController* DefaultShellBrowserMainDelegate::CreateDesktopController() {
-  return new ShellDesktopController();
+#if defined(USE_AURA)

[Yoyo Zhou, 2014/11/11 01:55:31]

These look a little funny now, but they'll make sense with an #elif
defined(USE_MACOSX) soon.

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

Acknowledged.

+  return new ShellDesktopControllerAura();
+#else
+  return NULL;
+#endif
 }
 
 }  // namespace extensions