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

Unified Diff: extensions/shell/browser/shell_browser_main_parts.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
Index: extensions/shell/browser/shell_browser_main_parts.cc
diff --git a/extensions/shell/browser/shell_browser_main_parts.cc b/extensions/shell/browser/shell_browser_main_parts.cc
index 869da6e36eed702a9428c0a5a5d709fb17c47907..85935ad57b5a1af82262671bd01027246e196da5 100644
--- a/extensions/shell/browser/shell_browser_main_parts.cc
+++ b/extensions/shell/browser/shell_browser_main_parts.cc
@@ -51,6 +51,10 @@
#include "extensions/shell/browser/shell_network_controller_chromeos.h"
#endif
+#if defined(OS_MACOSX)
+#include "extensions/shell/browser/shell_browser_main_parts_mac.h"
+#endif
+
#if !defined(DISABLE_NACL)
#include "components/nacl/browser/nacl_browser.h"
#include "components/nacl/browser/nacl_process_host.h"
@@ -90,6 +94,9 @@ ShellBrowserMainParts::~ShellBrowserMainParts() {
void ShellBrowserMainParts::PreMainMessageLoopStart() {
// TODO(jamescook): Initialize touch here?
+#if defined(OS_MACOSX)
+ MainPartsPreMainMessageLoopStartMac();
+#endif
}
void ShellBrowserMainParts::PostMainMessageLoopStart() {
« no previous file with comments | « extensions/shell/browser/shell_app_window_client_mac.mm ('k') | extensions/shell/browser/shell_browser_main_parts_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698