Wayland support for views. views_desktop on Wayland.

views/controls/menu/native_menu_linux.h

Index: views/controls/menu/native_menu_linux.h
diff --git a/views/controls/menu/native_menu_x.h b/views/controls/menu/native_menu_linux.h
similarity index 80%
rename from views/controls/menu/native_menu_x.h
rename to views/controls/menu/native_menu_linux.h
index 34ae8944e7c6042efd8c55eed1350325ac46940d..bfec464c91443671dec633fb61d44bab87a6a78d 100644
--- a/views/controls/menu/native_menu_x.h
+++ b/views/controls/menu/native_menu_linux.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_CONTROLS_MENU_NATIVE_MENU_X_H_
-#define VIEWS_CONTROLS_MENU_NATIVE_MENU_X_H_
+#ifndef VIEWS_CONTROLS_MENU_NATIVE_MENU_LINUX_H_
+#define VIEWS_CONTROLS_MENU_NATIVE_MENU_LINUX_H_
 #pragma once
 
 #include "views/controls/menu/menu_delegate.h"
@@ -19,11 +19,11 @@ namespace views {
 class MenuRunner;
 
 // A non-GTK implementation of MenuWrapper, used currently for touchui.
-class NativeMenuX : public MenuWrapper,
-                    public MenuDelegate {
+class NativeMenuLinux : public MenuWrapper,
+                        public MenuDelegate {
  public:
-  explicit NativeMenuX(Menu2* menu);
-  virtual ~NativeMenuX();
+  explicit NativeMenuLinux(Menu2* menu);
+  virtual ~NativeMenuLinux();
 
   // Overridden from MenuWrapper:
   virtual void RunMenuAt(const gfx::Point& point, int alignment);
@@ -51,9 +51,9 @@ class NativeMenuX : public MenuWrapper,
   MenuItemView* root_;
   scoped_ptr<MenuRunner> menu_runner_;
 
-  DISALLOW_COPY_AND_ASSIGN(NativeMenuX);
+  DISALLOW_COPY_AND_ASSIGN(NativeMenuLinux);
 };
 
 }  // namespace views
 
-#endif  // VIEWS_CONTROLS_MENU_NATIVE_MENU_X_H_
+#endif  // VIEWS_CONTROLS_MENU_NATIVE_MENU_LINUX_H_