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

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

Issue 745093002: AppShell support for Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: minors Created 6 years 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
« no previous file with comments | « extensions/shell/browser/DEPS ('k') | extensions/shell/browser/shell_app_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 978d27378d9f0887786651fe96676732ca7f2076..eb86cc47ebdc5b961697118f7f5fa5a447cdf252 100644
--- a/extensions/shell/browser/default_shell_browser_main_delegate.cc
+++ b/extensions/shell/browser/default_shell_browser_main_delegate.cc
@@ -15,6 +15,10 @@
#include "extensions/shell/browser/shell_desktop_controller_aura.h"
#endif
+#if defined(OS_MACOSX)
+#include "extensions/shell/browser/shell_desktop_controller_mac.h"
+#endif
+
namespace extensions {
DefaultShellBrowserMainDelegate::DefaultShellBrowserMainDelegate() {
@@ -67,6 +71,8 @@ void DefaultShellBrowserMainDelegate::Shutdown() {
DesktopController* DefaultShellBrowserMainDelegate::CreateDesktopController() {
#if defined(USE_AURA)
return new ShellDesktopControllerAura();
+#elif defined(OS_MACOSX)
+ return new ShellDesktopControllerMac();
#else
return NULL;
#endif
« no previous file with comments | « extensions/shell/browser/DEPS ('k') | extensions/shell/browser/shell_app_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698