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

Unified Diff: content/browser/browser_main_loop.h

Issue 10905076: Minimal if-def changes for OS_IOS in browser_main_loop.* (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fixed ordering Created 8 years, 3 months 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 | « no previous file | content/browser/browser_main_loop.cc » ('j') | content/browser/browser_main_loop.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main_loop.h
diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
index eb3de50d1b066c22d45939e67dd6a2a03df315f3..6f5abe5c67cfee323979558644430b08e22871e3 100644
--- a/content/browser/browser_main_loop.h
+++ b/content/browser/browser_main_loop.h
@@ -113,7 +113,7 @@ class BrowserMainLoop {
scoped_ptr<SystemMessageWindowWin> system_message_window_;
#elif defined(OS_LINUX)
scoped_ptr<DeviceMonitorLinux> device_monitor_linux_;
-#elif defined(OS_MACOSX)
+#elif defined(OS_MACOSX) && !defined(OS_IOS)
scoped_ptr<DeviceMonitorMac> device_monitor_mac_;
#endif
@@ -131,7 +131,9 @@ class BrowserMainLoop {
// Members initialized in |RunMainMessageLoopParts()| ------------------------
scoped_ptr<BrowserProcessSubThread> db_thread_;
+#if !defined(OS_IOS)
scoped_ptr<WebKitThread> webkit_thread_;
+#endif
scoped_ptr<BrowserProcessSubThread> file_user_blocking_thread_;
scoped_ptr<BrowserProcessSubThread> file_thread_;
scoped_ptr<BrowserProcessSubThread> process_launcher_thread_;
« no previous file with comments | « no previous file | content/browser/browser_main_loop.cc » ('j') | content/browser/browser_main_loop.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698