ash/shell/content_client/shell_browser_main_parts.cc - Issue 13947019: Clean up selected ash defines for MessagePumpLinux

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: correctly fixed merge conflict 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:

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 c24b69dac522ff26ff1564c5b9dcdb6e429361d9..81d3a106f4dee38d029e44da81311aabd5ca37a7 100644

--- a/ash/shell/content_client/shell_browser_main_parts.cc

+++ b/ash/shell/content_client/shell_browser_main_parts.cc

@@ -35,7 +35,7 @@

#include "ui/message_center/message_center.h"

#endif

-#if defined(OS_LINUX)

+#if defined(USE_X11)

#include "ui/base/touch/touch_factory_x11.h"

#endif

@@ -89,7 +89,7 @@ ShellBrowserMainParts::~ShellBrowserMainParts() {

#if !defined(OS_MACOSX)

void ShellBrowserMainParts::PreMainMessageLoopStart() {

-#if defined(OS_LINUX)

+#if defined(USE_X11)

ui::TouchFactory::SetTouchDeviceListFromCommandLine();

#endif

}

« no previous file with comments | « ash/shell.cc ('k') | ash/system/chromeos/tray_display.cc » ('j') | no next file with comments »