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

Unified Diff: chrome/browser/ui/ash/ash_init.cc

Issue 232133005: ozone: Protect X11-specific code under ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, one more X11 line showed up Created 6 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
Index: chrome/browser/ui/ash/ash_init.cc
diff --git a/chrome/browser/ui/ash/ash_init.cc b/chrome/browser/ui/ash/ash_init.cc
index d92d554fc9cb74f08e0e0f0258fee2b3352ba1c9..c3a8b51365558f9d0da5dcfd35425afe0af9b16e 100644
--- a/chrome/browser/ui/ash/ash_init.cc
+++ b/chrome/browser/ui/ash/ash_init.cc
@@ -44,12 +44,14 @@ bool ShouldOpenAshOnStartup() {
void OpenAsh() {
#if defined(OS_CHROMEOS)
+#if defined(USE_X11)
if (base::SysInfo::IsRunningOnChromeOS()) {
// Hides the cursor outside of the Aura root window. The cursor will be
// drawn within the Aura root window, and it'll remain hidden after the
// Aura window is closed.
ui::HideHostCursor();
}
+#endif
// Hide the mouse cursor completely at boot.
if (!chromeos::LoginState::Get()->IsUserLoggedIn())
« no previous file with comments | « ash/accelerators/accelerator_dispatcher_linux.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698