Move all desktop_* and related files to desktop_aura folder.

kalyankondapally · Feb 24, 2014 · f34b308 · f34b308 · tiagovignatti · Feb 24, 2014
1 parent 645903e
commit f34b308
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 29 deletions.
diff --git a/impl/desktop_aura/OWNERS b/impl/desktop_aura/OWNERS
@@ -0,0 +1,2 @@
+kalyan.kondapally@intel.com
+tiago.vignatti@intel.com
diff --git a/impl/desktop_drag_drop_client_wayland.cc → ..._aura/desktop_drag_drop_client_wayland.cc b/impl/desktop_drag_drop_client_wayland.cc → ..._aura/desktop_drag_drop_client_wayland.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 "ozone/impl/desktop_drag_drop_client_wayland.h"
+#include "ozone/impl/desktop_aura/desktop_drag_drop_client_wayland.h"
 
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/drop_target_event.h"

diff --git a/impl/desktop_drag_drop_client_wayland.h → ...p_aura/desktop_drag_drop_client_wayland.h b/impl/desktop_drag_drop_client_wayland.h → ...p_aura/desktop_drag_drop_client_wayland.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 OZONE_IMPL_DESKTOP_DRAG_DROP_CLIENT_WAYLAND_H_
-#define OZONE_IMPL_DESKTOP_DRAG_DROP_CLIENT_WAYLAND_H_
+#ifndef OZONE_IMPL_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_WAYLAND_H_
+#define OZONE_IMPL_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_WAYLAND_H_
 
 #include "base/compiler_specific.h"
 #include "ui/aura/client/drag_drop_client.h"
@@ -38,4 +38,4 @@ class VIEWS_EXPORT DesktopDragDropClientWayland
 
 }  // namespace ozonewayland
 
-#endif  // OZONE_IMPL_DESKTOP_DRAG_DROP_CLIENT_WAYLAND_H_
+#endif  // OZONE_IMPL_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_WAYLAND_H_
diff --git a/impl/desktop_factory_wayland.cc → impl/desktop_aura/desktop_factory_wayland.cc b/impl/desktop_factory_wayland.cc → impl/desktop_aura/desktop_factory_wayland.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ozone/impl/desktop_factory_wayland.h"
+#include "ozone/impl/desktop_aura/desktop_factory_wayland.h"
 
-#include "ozone/impl/desktop_window_tree_host_wayland.h"
+#include "ozone/impl/desktop_aura/desktop_window_tree_host_wayland.h"
 
 namespace ozonewayland {
 

diff --git a/impl/desktop_factory_wayland.h → impl/desktop_aura/desktop_factory_wayland.h b/impl/desktop_factory_wayland.h → impl/desktop_aura/desktop_factory_wayland.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 OZONE_IMPL_DESKTOP_FACTORY_WAYLAND_H_
-#define OZONE_IMPL_DESKTOP_FACTORY_WAYLAND_H_
+#ifndef OZONE_IMPL_DESKTOP_AURA_DESKTOP_FACTORY_WAYLAND_H_
+#define OZONE_IMPL_DESKTOP_AURA_DESKTOP_FACTORY_WAYLAND_H_
 
 #include "base/compiler_specific.h"
 #include "ozone/platform/ozone_export_wayland.h"
@@ -30,4 +30,4 @@ class OZONE_WAYLAND_EXPORT DesktopFactoryWayland
 
 }  // namespace ozonewayland
 
-#endif  //  OZONE_IMPL_DESKTOP_FACTORY_WAYLAND_H_
+#endif  //  OZONE_IMPL_DESKTOP_AURA_DESKTOP_FACTORY_WAYLAND_H_
diff --git a/impl/desktop_screen_wayland.cc → impl/desktop_aura/desktop_screen_wayland.cc b/impl/desktop_screen_wayland.cc → impl/desktop_aura/desktop_screen_wayland.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ozone/impl/desktop_screen_wayland.h"
+#include "ozone/impl/desktop_aura/desktop_screen_wayland.h"
 
-#include "ozone/impl/desktop_window_tree_host_wayland.h"
+#include "ozone/impl/desktop_aura/desktop_window_tree_host_wayland.h"
 #include "ui/aura/window.h"
 
 namespace ozonewayland {

diff --git a/impl/desktop_screen_wayland.h → impl/desktop_aura/desktop_screen_wayland.h b/impl/desktop_screen_wayland.h → impl/desktop_aura/desktop_screen_wayland.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 OZONE_IMPL_DESKTOP_SCREEN_WAYLAND_H__
-#define OZONE_IMPL_DESKTOP_SCREEN_WAYLAND_H__
+#ifndef OZONE_IMPL_DESKTOP_AURA_DESKTOP_SCREEN_WAYLAND_H__
+#define OZONE_IMPL_DESKTOP_AURA_DESKTOP_SCREEN_WAYLAND_H__
 
 #include <vector>
 
@@ -49,4 +49,4 @@ class DesktopScreenWayland : public gfx::Screen {
 
 }  // namespace ozonewayland
 
-#endif  // OZONE_IMPL_DESKTOP_SCREEN_WAYLAND_H__
+#endif  // OZONE_IMPL_DESKTOP_AURA_DESKTOP_SCREEN_WAYLAND_H__
diff --git a/impl/desktop_window_tree_host_wayland.cc → ..._aura/desktop_window_tree_host_wayland.cc b/impl/desktop_window_tree_host_wayland.cc → ..._aura/desktop_window_tree_host_wayland.cc
@@ -3,13 +3,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ozone/impl/desktop_window_tree_host_wayland.h"
+#include "ozone/impl/desktop_aura/desktop_window_tree_host_wayland.h"
 
 #include "base/bind.h"
-#include "ozone/impl/desktop_drag_drop_client_wayland.h"
-#include "ozone/impl/desktop_screen_wayland.h"
+#include "ozone/impl/desktop_aura/desktop_drag_drop_client_wayland.h"
+#include "ozone/impl/desktop_aura/desktop_screen_wayland.h"
+#include "ozone/impl/desktop_aura/window_tree_host_delegate_wayland.h"
 #include "ozone/impl/ozone_display.h"
-#include "ozone/impl/window_tree_host_delegate_wayland.h"
 #include "ozone/platform/ozone_export_wayland.h"
 #include "ozone/ui/events/window_state_change_handler.h"
 #include "ui/aura/client/cursor_client.h"

diff --git a/impl/desktop_window_tree_host_wayland.h → ...p_aura/desktop_window_tree_host_wayland.h b/impl/desktop_window_tree_host_wayland.h → ...p_aura/desktop_window_tree_host_wayland.h
@@ -3,8 +3,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef OZONE_IMPL_DESKTOP_WINDOW_TREE_HOST_WAYLAND_H_
-#define OZONE_IMPL_DESKTOP_WINDOW_TREE_HOST_WAYLAND_H_
+#ifndef OZONE_IMPL_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_WAYLAND_H_
+#define OZONE_IMPL_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_WAYLAND_H_
 
 #include <set>
 #include <vector>
@@ -200,4 +200,4 @@ class VIEWS_EXPORT DesktopWindowTreeHostWayland
 
 }  // namespace ozonewayland
 
-#endif  // OZONE_IMPL_DESKTOP_WINDOW_TREE_HOST_WAYLAND_H_
+#endif  // OZONE_IMPL_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_WAYLAND_H_
diff --git a/impl/impl_view.gypi → impl/desktop_aura/impl_view.gypi b/impl/impl_view.gypi → impl/desktop_aura/impl_view.gypi
diff --git a/impl/window_tree_host_delegate_wayland.cc → ...aura/window_tree_host_delegate_wayland.cc b/impl/window_tree_host_delegate_wayland.cc → ...aura/window_tree_host_delegate_wayland.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ozone/impl/window_tree_host_delegate_wayland.h"
+#include "ozone/impl/desktop_aura/window_tree_host_delegate_wayland.h"
 
-#include "ozone/impl/desktop_window_tree_host_wayland.h"
+#include "ozone/impl/desktop_aura/desktop_window_tree_host_wayland.h"
 #include "ozone/impl/ozone_display.h"
 #include "ozone/ui/events/event_converter_ozone_wayland.h"
 #include "ui/events/event_utils.h"

diff --git a/impl/window_tree_host_delegate_wayland.h → ..._aura/window_tree_host_delegate_wayland.h b/impl/window_tree_host_delegate_wayland.h → ..._aura/window_tree_host_delegate_wayland.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 OZONE_IMPL_WINDOW_TREE_HOST_DELEGATE_WAYLAND_H_
-#define OZONE_IMPL_WINDOW_TREE_HOST_DELEGATE_WAYLAND_H_
+#ifndef OZONE_IMPL_DESKTOP_AURA_WINDOW_TREE_HOST_DELEGATE_WAYLAND_H_
+#define OZONE_IMPL_DESKTOP_AURA_WINDOW_TREE_HOST_DELEGATE_WAYLAND_H_
 
 #include <list>
 #include <vector>
@@ -78,4 +78,4 @@ class WindowTreeHostDelegateWayland
 
 }  // namespace ozonewayland
 
-#endif  // OZONE_IMPL_WINDOW_TREE_HOST_DELEGATE_WAYLAND_H_
+#endif  // OZONE_IMPL_DESKTOP_AURA_WINDOW_TREE_HOST_DELEGATE_WAYLAND_H_
diff --git a/impl/ozone_display.cc b/impl/ozone_display.cc
@@ -6,7 +6,7 @@
 
 #include <map>
 #include "content/child/child_process.h"
-#include "ozone/impl/desktop_screen_wayland.h"
+#include "ozone/impl/desktop_aura/desktop_screen_wayland.h"
 #include "ozone/impl/ipc/display_channel.h"
 #include "ozone/impl/ipc/display_channel_host.h"
 #include "ozone/ui/events/event_converter_in_process.h"

diff --git a/ozone_impl.gyp b/ozone_impl.gyp
@@ -32,7 +32,7 @@
       'conditions': [
         ['toolkit_views==1 and chromeos == 0', {
           'includes': [
-            'impl/impl_view.gypi',
+            'impl/desktop_aura/impl_view.gypi',
           ],
         }],
       ],

diff --git a/platform/ozone_platform_wayland.h b/platform/ozone_platform_wayland.h
@@ -5,7 +5,7 @@
 #ifndef OZONE_PLATFORM_OZONE_PLATFORM_WAYLAND_H_
 #define OZONE_PLATFORM_OZONE_PLATFORM_WAYLAND_H_
 
-#include "ozone/impl/desktop_factory_wayland.h"
+#include "ozone/impl/desktop_aura/desktop_factory_wayland.h"
 #include "ozone/impl/ozone_display.h"
 #include "ozone/impl/surface_factory_wayland.h"
 #include "ozone/platform/ozone_export_wayland.h"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		kalyan.kondapally@intel.com
		tiago.vignatti@intel.com