Move the desktop aura classes into a desktop subdir to make the gyp simpler.

http://crbug.com/158115 TBR=sky@chromium.org Review URL: https://codereview.chromium.org/11369220 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167460 0039d316-1c4b-4281-b951-d872f2087c98
author: ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2012-11-13 20:41:23 +0000
committer: ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2012-11-13 20:41:23 +0000
commit: 02957546d7b62bee2f89bdae56ecc15f5e5938b3 (patch)
tree: 1b01fcbaeba84bab432f38062d2d5fb62fd81efd /ui
parent: 5e12296a32db03df00c4a59cad683621e1a9f5ec (diff)
download: chromium_src-02957546d7b62bee2f89bdae56ecc15f5e5938b3.zip
chromium_src-02957546d7b62bee2f89bdae56ecc15f5e5938b3.tar.gz
chromium_src-02957546d7b62bee2f89bdae56ecc15f5e5938b3.tar.bz2
22 files changed, 74 insertions, 79 deletions
diff --git a/ui/views/examples/examples_window_with_content.cc b/ui/views/examples/examples_window_with_content.cc
index ce7bf37..56da74e 100644
--- a/ui/views/examples/examples_window_with_content.cc
+++ b/ui/views/examples/examples_window_with_content.cc
@@ -46,7 +46,7 @@
 #include "ui/views/widget/widget_delegate.h"
 
 #if defined(USE_AURA)
-#include "ui/views/widget/desktop_native_widget_aura.h"
+#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #endif
 
 namespace views {
diff --git a/ui/views/test/desktop_test_views_delegate.cc b/ui/views/test/desktop_test_views_delegate.cc
index d70d622..6f53762 100644
--- a/ui/views/test/desktop_test_views_delegate.cc
+++ b/ui/views/test/desktop_test_views_delegate.cc
@@ -4,7 +4,7 @@
 
 #include "ui/views/test/desktop_test_views_delegate.h"
 
-#include "ui/views/widget/desktop_native_widget_aura.h"
+#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/widget/native_widget_aura.h"
 
 namespace views {
diff --git a/ui/views/test/test_views_delegate.cc b/ui/views/test/test_views_delegate.cc
index d1c8bc6..8371bcd 100644
--- a/ui/views/test/test_views_delegate.cc
+++ b/ui/views/test/test_views_delegate.cc
@@ -9,8 +9,8 @@
 #include "content/public/test/web_contents_tester.h"
 
 #if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/widget/native_widget_aura.h"
-#include "ui/views/widget/desktop_native_widget_aura.h"
 #endif
 
 namespace views {
diff --git a/ui/views/views.gyp b/ui/views/views.gyp
index 3550f7f..4c342b7 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -320,30 +320,35 @@
         'widget/child_window_message_processor.h',
         'widget/default_theme_provider.cc',
         'widget/default_theme_provider.h',
-        # TODO(beng): rename to 'widget/desktop_aura/' hence this sort order:
         'widget/desktop_aura/desktop_activation_client.cc',
         'widget/desktop_aura/desktop_activation_client.h',
         'widget/desktop_aura/desktop_cursor_client.cc',
         'widget/desktop_aura/desktop_cursor_client.h',
         'widget/desktop_aura/desktop_dispatcher_client.cc',
         'widget/desktop_aura/desktop_dispatcher_client.h',
+        'widget/desktop_aura/desktop_layout_manager.cc',
+        'widget/desktop_aura/desktop_layout_manager.h',
+        'widget/desktop_aura/desktop_native_widget_aura.cc',
+        'widget/desktop_aura/desktop_native_widget_aura.h',
+        'widget/desktop_aura/desktop_root_window_host.h',
+        'widget/desktop_aura/desktop_root_window_host_linux.cc',
+        'widget/desktop_aura/desktop_root_window_host_linux.h',
+        'widget/desktop_aura/desktop_root_window_host_win.cc',
+        'widget/desktop_aura/desktop_root_window_host_win.h',
         'widget/desktop_aura/desktop_screen.h',
+        'widget/desktop_aura/desktop_screen_position_client.cc',
+        'widget/desktop_aura/desktop_screen_position_client.h',
         'widget/desktop_aura/desktop_screen_win.cc',
         'widget/desktop_aura/desktop_screen_win.h',
         'widget/desktop_aura/desktop_screen_x11.cc',
         'widget/desktop_aura/desktop_stacking_client.cc',
         'widget/desktop_aura/desktop_stacking_client.h',
-        'widget/desktop_layout_manager.cc',
-        'widget/desktop_layout_manager.h',
-        'widget/desktop_native_widget_aura.cc',
-        'widget/desktop_native_widget_aura.h',
-        'widget/desktop_root_window_host.h',
-        'widget/desktop_root_window_host_linux.cc',
-        'widget/desktop_root_window_host_linux.h',
-        'widget/desktop_root_window_host_win.cc',
-        'widget/desktop_root_window_host_win.h',
-        'widget/desktop_screen_position_client.cc',
-        'widget/desktop_screen_position_client.h',
+        'widget/desktop_aura/x11_desktop_handler.cc',
+        'widget/desktop_aura/x11_desktop_handler.h',
+        'widget/desktop_aura/x11_desktop_window_move_client.cc',
+        'widget/desktop_aura/x11_desktop_window_move_client.h',
+        'widget/desktop_aura/x11_window_event_filter.cc',
+        'widget/desktop_aura/x11_window_event_filter.h',
         'widget/drop_helper.cc',
         'widget/drop_helper.h',
         'widget/drop_target_win.cc',
@@ -378,12 +383,6 @@
         'widget/widget_message_filter.cc',
         'widget/widget_message_filter.h',
         'widget/widget_observer.h',
-        'widget/x11_desktop_handler.cc',
-        'widget/x11_desktop_handler.h',
-        'widget/x11_desktop_window_move_client.cc',
-        'widget/x11_desktop_window_move_client.h',
-        'widget/x11_window_event_filter.cc',
-        'widget/x11_window_event_filter.h',
         'win/fullscreen_handler.cc',
         'win/fullscreen_handler.h',
         'win/hwnd_message_handler.cc',
@@ -446,8 +445,8 @@
                 ['include', 'ime/input_method_win.h'],
                 ['include', 'widget/desktop_aura/desktop_screen_win.cc'],
                 ['include', 'widget/desktop_aura/desktop_screen_win.h'],
-                ['include', 'widget/desktop_root_window_host_win.cc'],
-                ['include', 'widget/desktop_root_window_host_win.h'],
+                ['include', 'widget/desktop_aura/desktop_root_window_host_win.cc'],
+                ['include', 'widget/desktop_aura/desktop_root_window_host_win.h'],
               ],
             }],
           ],
@@ -455,9 +454,7 @@
         ['use_aura==0', {
           'sources/': [
             ['exclude', 'corewm'],
-            ['exclude', '/desktop_[^/]*\\.cc$'],
-            ['exclude', '/x11_[^/]*\\.cc$'],
-            ['exclude', 'widget/desktop_aura/'],
+            ['exclude', 'widget/desktop_aura'],
             ['exclude', 'widget/native_widget_aura_window_observer.cc'],
             ['exclude', 'widget/native_widget_aura_window_observer.h'],
             ['exclude', 'widget/widget_aura_utils.cc'],
@@ -466,8 +463,6 @@
         }],
         ['chromeos==1', {
           'sources/': [
-            ['exclude', '/desktop_[^/]*\\.cc$'],
-            ['exclude', 'widget/x11_*'],
             ['exclude', 'widget/desktop_aura'],
           ],
         }],
diff --git a/ui/views/widget/desktop_layout_manager.cc b/ui/views/widget/desktop_aura/desktop_layout_manager.cc
index c012dbf..f376e0b4 100644
--- a/ui/views/widget/desktop_layout_manager.cc
+++ b/ui/views/widget/desktop_aura/desktop_layout_manager.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/views/widget/desktop_layout_manager.h"
+#include "ui/views/widget/desktop_aura/desktop_layout_manager.h"
 
 #include "ui/aura/root_window.h"
 #include "ui/gfx/rect.h"
diff --git a/ui/views/widget/desktop_layout_manager.h b/ui/views/widget/desktop_aura/desktop_layout_manager.h
index f6795d0..c74202e 100644
--- a/ui/views/widget/desktop_layout_manager.h
+++ b/ui/views/widget/desktop_aura/desktop_layout_manager.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 UI_VIEWS_WIDGET_DESKTOP_LAYOUT_MANAGER_H_
-#define UI_VIEWS_WIDGET_DESKTOP_LAYOUT_MANAGER_H_
+#ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_LAYOUT_MANAGER_H_
+#define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_LAYOUT_MANAGER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ -46,4 +46,4 @@ class VIEWS_EXPORT DesktopLayoutManager : public aura::LayoutManager {
 
 }  // namespace views
 
-#endif  // UI_VIEWS_WIDGET_DESKTOP_LAYOUT_MANAGER_H_
+#endif  // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_LAYOUT_MANAGER_H_
diff --git a/ui/views/widget/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
index cb5058e..083ab6b 100644
--- a/ui/views/widget/desktop_native_widget_aura.cc
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/views/widget/desktop_native_widget_aura.h"
+#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 
 #include "base/bind.h"
 #include "ui/aura/client/stacking_client.h"
@@ -16,7 +16,7 @@
 #include "ui/compositor/layer.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/ime/input_method.h"
-#include "ui/views/widget/desktop_root_window_host.h"
+#include "ui/views/widget/desktop_aura/desktop_root_window_host.h"
 #include "ui/views/widget/native_widget_aura_window_observer.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_aura_utils.h"
diff --git a/ui/views/widget/desktop_native_widget_aura.h b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
index 8f6d8e9..c4fbf60 100644
--- a/ui/views/widget/desktop_native_widget_aura.h
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.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 UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_AURA_H_
-#define UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_AURA_H_
+#ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
+#define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
 
 #include "base/memory/weak_ptr.h"
 #include "ui/aura/client/activation_delegate.h"
@@ -187,4 +187,4 @@ class VIEWS_EXPORT DesktopNativeWidgetAura
 
 }  // namespace views
 
-#endif  // UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_AURA_H_
+#endif  // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
diff --git a/ui/views/widget/desktop_root_window_host.h b/ui/views/widget/desktop_aura/desktop_root_window_host.h
index 7557413..bf2655e 100644
--- a/ui/views/widget/desktop_root_window_host.h
+++ b/ui/views/widget/desktop_aura/desktop_root_window_host.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 UI_VIEWS_WIDGET_DESKTOP_ROOT_WINDOW_HOST_H_
-#define UI_VIEWS_WIDGET_DESKTOP_ROOT_WINDOW_HOST_H_
+#ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_H_
+#define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_H_
 
 #include "ui/base/ui_base_types.h"
 #include "ui/views/views_export.h"
@@ -123,4 +123,4 @@ class VIEWS_EXPORT DesktopRootWindowHost {
 
 }  // namespace views
 
-#endif  // UI_VIEWS_WIDGET_DESKTOP_ROOT_WINDOW_HOST_H_
+#endif  // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_H_
diff --git a/ui/views/widget/desktop_root_window_host_linux.cc b/ui/views/widget/desktop_aura/desktop_root_window_host_linux.cc
index 94c9881..6b6990a 100644
--- a/ui/views/widget/desktop_root_window_host_linux.cc
+++ b/ui/views/widget/desktop_aura/desktop_root_window_host_linux.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/views/widget/desktop_root_window_host_linux.h"
+#include "ui/views/widget/desktop_aura/desktop_root_window_host_linux.h"
 
 #include <X11/extensions/XInput2.h>
 #include <X11/Xatom.h>
@@ -27,12 +27,12 @@
 #include "ui/views/widget/desktop_aura/desktop_activation_client.h"
 #include "ui/views/widget/desktop_aura/desktop_cursor_client.h"
 #include "ui/views/widget/desktop_aura/desktop_dispatcher_client.h"
-#include "ui/views/widget/desktop_layout_manager.h"
-#include "ui/views/widget/desktop_native_widget_aura.h"
-#include "ui/views/widget/desktop_screen_position_client.h"
-#include "ui/views/widget/x11_desktop_handler.h"
-#include "ui/views/widget/x11_desktop_window_move_client.h"
-#include "ui/views/widget/x11_window_event_filter.h"
+#include "ui/views/widget/desktop_aura/desktop_layout_manager.h"
+#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
+#include "ui/views/widget/desktop_aura/desktop_screen_position_client.h"
+#include "ui/views/widget/desktop_aura/x11_desktop_handler.h"
+#include "ui/views/widget/desktop_aura/x11_desktop_window_move_client.h"
+#include "ui/views/widget/desktop_aura/x11_window_event_filter.h"
 
 namespace views {
 
diff --git a/ui/views/widget/desktop_root_window_host_linux.h b/ui/views/widget/desktop_aura/desktop_root_window_host_linux.h
index 4f965ee3..3f705f2 100644
--- a/ui/views/widget/desktop_root_window_host_linux.h
+++ b/ui/views/widget/desktop_aura/desktop_root_window_host_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 UI_VIEWS_WIDGET_DESKTOP_ROOT_WINDOW_HOST_LINUX_H_
-#define UI_VIEWS_WIDGET_DESKTOP_ROOT_WINDOW_HOST_LINUX_H_
+#ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_LINUX_H_
+#define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_LINUX_H_
 
 #include <X11/Xlib.h>
 
@@ -19,7 +19,7 @@
 #include "ui/base/x/x11_atom_cache.h"
 #include "ui/views/ime/input_method_delegate.h"
 #include "ui/views/views_export.h"
-#include "ui/views/widget/desktop_root_window_host.h"
+#include "ui/views/widget/desktop_aura/desktop_root_window_host.h"
 
 namespace aura {
 class FocusManager;
@@ -250,4 +250,4 @@ class VIEWS_EXPORT DesktopRootWindowHostLinux
 
 }  // namespace views
 
-#endif  // UI_VIEWS_WIDGET_DESKTOP_ROOT_WINDOW_HOST_LINUX_H_
+#endif  // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_LINUX_H_
diff --git a/ui/views/widget/desktop_root_window_host_win.cc b/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc
index bfa169e..6f808dc 100644
--- a/ui/views/widget/desktop_root_window_host_win.cc
+++ b/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/views/widget/desktop_root_window_host_win.h"
+#include "ui/views/widget/desktop_aura/desktop_root_window_host_win.h"
 
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkRegion.h"
@@ -23,8 +23,8 @@
 #include "ui/views/widget/desktop_aura/desktop_activation_client.h"
 #include "ui/views/widget/desktop_aura/desktop_cursor_client.h"
 #include "ui/views/widget/desktop_aura/desktop_dispatcher_client.h"
-#include "ui/views/widget/desktop_native_widget_aura.h"
-#include "ui/views/widget/desktop_screen_position_client.h"
+#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
+#include "ui/views/widget/desktop_aura/desktop_screen_position_client.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/views/widget/widget_hwnd_utils.h"
 #include "ui/views/win/fullscreen_handler.h"
diff --git a/ui/views/widget/desktop_root_window_host_win.h b/ui/views/widget/desktop_aura/desktop_root_window_host_win.h
index 2497c4e..b9cf037 100644
--- a/ui/views/widget/desktop_root_window_host_win.h
+++ b/ui/views/widget/desktop_aura/desktop_root_window_host_win.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_VIEWS_WIDGET_DESKTOP_ROOT_WINDOW_HOST_WIN_H_
-#define UI_VIEWS_WIDGET_DESKTOP_ROOT_WINDOW_HOST_WIN_H_
+#ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_WIN_H_
+#define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_WIN_H_
 
 #include "ui/aura/root_window_host.h"
 #include "ui/views/views_export.h"
-#include "ui/views/widget/desktop_root_window_host.h"
+#include "ui/views/widget/desktop_aura/desktop_root_window_host.h"
 #include "ui/views/win/hwnd_message_handler_delegate.h"
 
 namespace aura {
@@ -239,4 +239,4 @@ class VIEWS_EXPORT DesktopRootWindowHostWin
 
 }  // namespace views
 
-#endif  // UI_VIEWS_WIDGET_DESKTOP_ROOT_WINDOW_HOST_WIN_H_
+#endif  // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_ROOT_WINDOW_HOST_WIN_H_
diff --git a/ui/views/widget/desktop_screen_position_client.cc b/ui/views/widget/desktop_aura/desktop_screen_position_client.cc
index 00adf8c..73554df 100644
--- a/ui/views/widget/desktop_screen_position_client.cc
+++ b/ui/views/widget/desktop_aura/desktop_screen_position_client.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/views/widget/desktop_screen_position_client.h"
+#include "ui/views/widget/desktop_aura/desktop_screen_position_client.h"
 
 #include "ui/aura/root_window.h"
-#include "ui/views/widget/desktop_native_widget_aura.h"
+#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 
 namespace views {
 
diff --git a/ui/views/widget/desktop_screen_position_client.h b/ui/views/widget/desktop_aura/desktop_screen_position_client.h
index a53290c..44fbbab 100644
--- a/ui/views/widget/desktop_screen_position_client.h
+++ b/ui/views/widget/desktop_aura/desktop_screen_position_client.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 UI_VIEWS_WIDGET_DESKTOP_SCREEN_POSITION_CLIENT_H_
-#define UI_VIEWS_WIDGET_DESKTOP_SCREEN_POSITION_CLIENT_H_
+#ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_POSITION_CLIENT_H_
+#define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_POSITION_CLIENT_H_
 
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/views/views_export.h"
@@ -32,4 +32,4 @@ class VIEWS_EXPORT DesktopScreenPositionClient
 
 }  // namespace views
 
-#endif  // UI_VIEWS_WIDGET_DESKTOP_SCREEN_POSITION_CLIENT_H_
+#endif  // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_POSITION_CLIENT_H_
diff --git a/ui/views/widget/x11_desktop_handler.cc b/ui/views/widget/desktop_aura/x11_desktop_handler.cc
index eccf16c..ef01301 100644
--- a/ui/views/widget/x11_desktop_handler.cc
+++ b/ui/views/widget/desktop_aura/x11_desktop_handler.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/views/widget/x11_desktop_handler.h"
+#include "ui/views/widget/desktop_aura/x11_desktop_handler.h"
 
 #include "base/message_loop.h"
 #include "ui/aura/env.h"
@@ -13,7 +13,7 @@
 
 #if !defined(OS_CHROMEOS)
 #include "ui/views/ime/input_method.h"
-#include "ui/views/widget/desktop_root_window_host_linux.h"
+#include "ui/views/widget/desktop_aura/desktop_root_window_host_linux.h"
 #endif
 
 namespace {
diff --git a/ui/views/widget/x11_desktop_handler.h b/ui/views/widget/desktop_aura/x11_desktop_handler.h
index 2b79d40..151c7ae 100644
--- a/ui/views/widget/x11_desktop_handler.h
+++ b/ui/views/widget/desktop_aura/x11_desktop_handler.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 UI_VIEWS_WIDGET_X11_DESKTOP_HANDLER_H_
-#define UI_VIEWS_WIDGET_X11_DESKTOP_HANDLER_H_
+#ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_
+#define UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_
 
 #include <X11/Xlib.h>
 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class.
@@ -64,4 +64,4 @@ class VIEWS_EXPORT X11DesktopHandler
 
 }  // namespace views
 
-#endif  // UI_VIEWS_WIDGET_X11_DESKTOP_HANDLER_H_
+#endif  // UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_
diff --git a/ui/views/widget/x11_desktop_window_move_client.cc b/ui/views/widget/desktop_aura/x11_desktop_window_move_client.cc
index 2a80886..689e230 100644
--- a/ui/views/widget/x11_desktop_window_move_client.cc
+++ b/ui/views/widget/desktop_aura/x11_desktop_window_move_client.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/views/widget/x11_desktop_window_move_client.h"
+#include "ui/views/widget/desktop_aura/x11_desktop_window_move_client.h"
 
 #include <X11/Xlib.h>
 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class.
diff --git a/ui/views/widget/x11_desktop_window_move_client.h b/ui/views/widget/desktop_aura/x11_desktop_window_move_client.h
index 0e3dae5..fa4cfac 100644
--- a/ui/views/widget/x11_desktop_window_move_client.h
+++ b/ui/views/widget/desktop_aura/x11_desktop_window_move_client.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 UI_VIEWS_WIDGET_X11_DESKTOP_WINDOW_MOVE_CLIENT_H_
-#define UI_VIEWS_WIDGET_X11_DESKTOP_WINDOW_MOVE_CLIENT_H_
+#ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_WINDOW_MOVE_CLIENT_H_
+#define UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_WINDOW_MOVE_CLIENT_H_
 
 #include <X11/Xlib.h>
 
@@ -64,4 +64,4 @@ class VIEWS_EXPORT X11DesktopWindowMoveClient
 
 }  // namespace views
 
-#endif  // UI_VIEWS_WIDGET_X11_DESKTOP_WINDOW_MOVE_CLIENT_H_
+#endif  // UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_WINDOW_MOVE_CLIENT_H_
diff --git a/ui/views/widget/x11_window_event_filter.cc b/ui/views/widget/desktop_aura/x11_window_event_filter.cc
index 93027a5..10e6ceb 100644
--- a/ui/views/widget/x11_window_event_filter.cc
+++ b/ui/views/widget/desktop_aura/x11_window_event_filter.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/views/widget/x11_window_event_filter.h"
+#include "ui/views/widget/desktop_aura/x11_window_event_filter.h"
 
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
diff --git a/ui/views/widget/x11_window_event_filter.h b/ui/views/widget/desktop_aura/x11_window_event_filter.h
index 80d1f2c..27d8624 100644
--- a/ui/views/widget/x11_window_event_filter.h
+++ b/ui/views/widget/desktop_aura/x11_window_event_filter.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 UI_VIEWS_WIDGET_X11_WINDOW_EVENT_FILTER_H_
-#define UI_VIEWS_WIDGET_X11_WINDOW_EVENT_FILTER_H_
+#ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_X11_WINDOW_EVENT_FILTER_H_
+#define UI_VIEWS_WIDGET_DESKTOP_AURA_X11_WINDOW_EVENT_FILTER_H_
 
 #include <X11/Xlib.h>
 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class.
@@ -75,4 +75,4 @@ class VIEWS_EXPORT X11WindowEventFilter : public aura::EventFilter {
 
 }  // namespace views
 
-#endif  // UI_VIEWS_WIDGET_X11_WINDOW_EVENT_FILTER_H_
+#endif  // UI_VIEWS_WIDGET_DESKTOP_AURA_X11_WINDOW_EVENT_FILTER_H_
diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc
index 1c47e75..7b30923 100644
--- a/ui/views/widget/native_widget_aura.cc
+++ b/ui/views/widget/native_widget_aura.cc
@@ -32,7 +32,7 @@
 #include "ui/views/drag_utils.h"
 #include "ui/views/ime/input_method_bridge.h"
 #include "ui/views/views_delegate.h"
-#include "ui/views/widget/desktop_native_widget_aura.h"
+#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/widget/drop_helper.h"
 #include "ui/views/widget/native_widget_aura_window_observer.h"
 #include "ui/views/widget/native_widget_delegate.h"
@@ -45,11 +45,11 @@
 #include "base/win/scoped_gdi_object.h"
 #include "base/win/win_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
-#include "ui/views/widget/desktop_root_window_host_win.h"
+#include "ui/views/widget/desktop_aura/desktop_root_window_host_win.h"
 #endif
 
 #if !defined(OS_CHROMEOS)
-#include "ui/views/widget/desktop_root_window_host.h"
+#include "ui/views/widget/desktop_aura/desktop_root_window_host.h"
 #endif
 
 namespace views {
author	ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2012-11-13 20:41:23 +0000
committer	ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2012-11-13 20:41:23 +0000
commit	02957546d7b62bee2f89bdae56ecc15f5e5938b3 (patch)
tree	1b01fcbaeba84bab432f38062d2d5fb62fd81efd /ui
parent	5e12296a32db03df00c4a59cad683621e1a9f5ec (diff)
download	chromium_src-02957546d7b62bee2f89bdae56ecc15f5e5938b3.zip chromium_src-02957546d7b62bee2f89bdae56ecc15f5e5938b3.tar.gz chromium_src-02957546d7b62bee2f89bdae56ecc15f5e5938b3.tar.bz2