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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/shell/content_client/shell_browser_main_parts.cc

Issue 13947019: Clean up selected ash defines for MessagePumpLinux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: proof-reading Created 7 years, 8 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
« ash/display/display_controller.cc ('K') | « ash/shell.cc ('k') | ash/system/chromeos/tray_display.cc » ('j') | ash/wm/system_gesture_event_filter.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/content_client/shell_browser_main_parts.cc
diff --git a/ash/shell/content_client/shell_browser_main_parts.cc b/ash/shell/content_client/shell_browser_main_parts.cc
index f413bae845afbf54abdbccade72f8bc8cd3c1dd8..1b5dd6166404df731f5aaf7b697207251482c8d9 100644
--- a/ash/shell/content_client/shell_browser_main_parts.cc
+++ b/ash/shell/content_client/shell_browser_main_parts.cc
@@ -89,7 +89,7 @@ ShellBrowserMainParts::~ShellBrowserMainParts() {
#if !defined(OS_MACOSX)
void ShellBrowserMainParts::PreMainMessageLoopStart() {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) && !defined(USE_MESSAGEPUMP_LINUX)
sadrul 2013/04/09 18:50:24 This should just be #if defined(USE_X11)
rjkroege 2013/04/09 19:50:10 That sounds reasonable. done.
ui::TouchFactory::SetTouchDeviceListFromCommandLine();
#endif
}
« ash/display/display_controller.cc ('K') | « ash/shell.cc ('k') | ash/system/chromeos/tray_display.cc » ('j') | ash/wm/system_gesture_event_filter.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698