Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(107)

Unified Diff: extensions/shell/browser/default_shell_browser_main_delegate.cc

Issue 696063008: Refactor ShellDesktopController and ShellNativeAppWindow to allow for non-aura implementations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: rebase Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/shell/browser/default_shell_browser_main_delegate.cc
diff --git a/extensions/shell/browser/default_shell_browser_main_delegate.cc b/extensions/shell/browser/default_shell_browser_main_delegate.cc
index 7e49f52e41184bbcac078f9b3e1dbd31dcc29688..0e17df2b73e13c66ec8fc862706b9695c4ece97d 100644
--- a/extensions/shell/browser/default_shell_browser_main_delegate.cc
+++ b/extensions/shell/browser/default_shell_browser_main_delegate.cc
@@ -8,10 +8,13 @@
#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() {
@@ -53,7 +56,11 @@ void DefaultShellBrowserMainDelegate::Shutdown() {
}
DesktopController* DefaultShellBrowserMainDelegate::CreateDesktopController() {
- return new ShellDesktopController();
+#if defined(USE_AURA)
+ return new ShellDesktopControllerAura();
+#else
+ return NULL;
+#endif
}
} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698