Clean up selected ash defines for MessagePumpLinux

Clean up selected ash defines for MessagePumpLinux

MessagePumpLinux implies the absence of an X server. Fix up
some defines in ash appropriately for this.

BUG=180666
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=197446

[rjkroege, 2013-04-09 18:45:41]

please take a look.

[sadrul, 2013-04-09 18:50:24]

https://codereview.chromium.org/13947019/diff/2001/ash/display/display_contro...
File ash/display/display_controller.cc (right):

https://codereview.chromium.org/13947019/diff/2001/ash/display/display_contro...
ash/display/display_controller.cc:49: #endif
  // defined(USE_X11)

https://codereview.chromium.org/13947019/diff/2001/ash/shell/content_client/s...
File ash/shell/content_client/shell_browser_main_parts.cc (right):

https://codereview.chromium.org/13947019/diff/2001/ash/shell/content_client/s...
ash/shell/content_client/shell_browser_main_parts.cc:38: #if defined(OS_LINUX)
This should be #if defined(USE_X11)

https://codereview.chromium.org/13947019/diff/2001/ash/shell/content_client/s...
ash/shell/content_client/shell_browser_main_parts.cc:92: #if defined(OS_LINUX)
&& !defined(USE_MESSAGEPUMP_LINUX)
This should just be #if defined(USE_X11)

https://codereview.chromium.org/13947019/diff/2001/ash/wm/system_gesture_even...
File ash/wm/system_gesture_event_filter.cc (right):

https://codereview.chromium.org/13947019/diff/2001/ash/wm/system_gesture_even...
ash/wm/system_gesture_event_filter.cc:59: #if defined(OS_CHROMEOS) &&
!defined(USE_MESSAGEPUMP_LINUX)
defined(USE_X11)

[rjkroege, 2013-04-09 19:50:10]

https://codereview.chromium.org/13947019/diff/2001/ash/display/display_contro...
File ash/display/display_controller.cc (right):

https://codereview.chromium.org/13947019/diff/2001/ash/display/display_contro...
ash/display/display_controller.cc:49: #endif
On 2013/04/09 18:50:24, sadrul wrote:
>   // defined(USE_X11)

Done.

https://codereview.chromium.org/13947019/diff/2001/ash/shell/content_client/s...
File ash/shell/content_client/shell_browser_main_parts.cc (right):

https://codereview.chromium.org/13947019/diff/2001/ash/shell/content_client/s...
ash/shell/content_client/shell_browser_main_parts.cc:38: #if defined(OS_LINUX)
On 2013/04/09 18:50:24, sadrul wrote:
> This should be #if defined(USE_X11)

Done.

https://codereview.chromium.org/13947019/diff/2001/ash/shell/content_client/s...
ash/shell/content_client/shell_browser_main_parts.cc:92: #if defined(OS_LINUX)
&& !defined(USE_MESSAGEPUMP_LINUX)
On 2013/04/09 18:50:24, sadrul wrote:
> This should just be #if defined(USE_X11)

That sounds reasonable. done.

https://codereview.chromium.org/13947019/diff/2001/ash/wm/system_gesture_even...
File ash/wm/system_gesture_event_filter.cc (right):

https://codereview.chromium.org/13947019/diff/2001/ash/wm/system_gesture_even...
ash/wm/system_gesture_event_filter.cc:59: #if defined(OS_CHROMEOS) &&
!defined(USE_MESSAGEPUMP_LINUX)
On 2013/04/09 18:50:24, sadrul wrote:
> defined(USE_X11)

logic for U_MPL here: it will be easier to find this and remove it once we
support mouses with MPL than if it was X11. I'll add a TODO.

[sadrul, 2013-04-09 20:05:41]

LGTM

https://codereview.chromium.org/13947019/diff/7001/ash/shell.h
File ash/shell.h (right):

https://codereview.chromium.org/13947019/diff/7001/ash/shell.h#newcode435
ash/shell.h:435: #endif  // defined(OS_CHROMEOS)
 && defined(USE_X11) here too. sorry I missed this earlier.

https://codereview.chromium.org/13947019/diff/7001/ash/shell.h#newcode572
ash/shell.h:572: #endif  // defined(OS_CHROMEOS)
ditto

[rjkroege, 2013-04-09 20:51:42]

+ben for owners please.

https://codereview.chromium.org/13947019/diff/7001/ash/shell.h
File ash/shell.h (right):

https://codereview.chromium.org/13947019/diff/7001/ash/shell.h#newcode435
ash/shell.h:435: #endif  // defined(OS_CHROMEOS)
On 2013/04/09 20:05:42, sadrul wrote:
>  && defined(USE_X11) here too. sorry I missed this earlier.

Done.

https://codereview.chromium.org/13947019/diff/7001/ash/shell.h#newcode572
ash/shell.h:572: #endif  // defined(OS_CHROMEOS)
On 2013/04/09 20:05:42, sadrul wrote:
> ditto

Done.

[Ben Goodger (Google), 2013-04-10 16:29:03]

lgtm

[commit-bot: I haz the power, 2013-04-10 16:33:06]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/rjkroege@chromium.org/13947019/6002

[commit-bot: I haz the power, 2013-04-10 16:33:10]

Failed to apply patch for ash/system/chromeos/tray_display.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file ash/system/chromeos/tray_display.cc
  Hunk #2 FAILED at 87.
  Hunk #3 succeeded at 141 (offset -4 lines).
  1 out of 3 hunks FAILED -- saving rejects to file
ash/system/chromeos/tray_display.cc.rej

Patch:       ash/system/chromeos/tray_display.cc
Index: ash/system/chromeos/tray_display.cc
diff --git a/ash/system/chromeos/tray_display.cc
b/ash/system/chromeos/tray_display.cc
index
cbe35a0990d1f413cc3399194325601f172eecbd..c3e3074e2ccfcbf7acc837067822c65a8538dead
100644
--- a/ash/system/chromeos/tray_display.cc
+++ b/ash/system/chromeos/tray_display.cc
@@ -58,6 +58,9 @@ class DisplayView : public ash::internal::ActionableView {
   virtual ~DisplayView() {}
 
   void Update() {
+#if !defined(USE_X11)
+     SetVisible(false);
+#else
     chromeos::OutputState state =
         base::chromeos::IsRunningOnChromeOS() ?
         Shell::GetInstance()->output_configurator()->output_state() :
@@ -84,6 +87,7 @@ class DisplayView : public ash::internal::ActionableView {
       default:
         NOTREACHED();
     }
+#endif
   }
 
   chromeos::OutputState InferOutputState() const {
@@ -142,12 +146,16 @@ TrayDisplay::TrayDisplay(SystemTray* system_tray)
     : SystemTrayItem(system_tray),
       default_(NULL) {
   Shell::GetScreen()->AddObserver(this);
+#if defined(USE_X11)
   Shell::GetInstance()->output_configurator()->AddObserver(this);
+#endif
 }
 
 TrayDisplay::~TrayDisplay() {
   Shell::GetScreen()->RemoveObserver(this);
+#if defined(USE_X11)
   Shell::GetInstance()->output_configurator()->RemoveObserver(this);
+#endif
 }
 
 views::View* TrayDisplay::CreateDefaultView(user::LoginStatus status) {

[commit-bot: I haz the power, 2013-04-30 18:22:57]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/rjkroege@chromium.org/13947019/17001

[commit-bot: I haz the power, 2013-04-30 20:27:22]

Change committed as 197446