views: Move desktop and touchui directories to ui/views/.

BUG=104039
R=ben@chromium.org

Review URL: http://codereview.chromium.org/8568022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110316 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chrome_browser_parts_views.cc

@@ -9,7 +9,7 @@
 #include "base/command_line.h"
 #include "chrome/browser/ui/views/chrome_views_delegate.h"
 #include "chrome/common/chrome_switches.h"
-#include "views/desktop/desktop_window_view.h"
+#include "ui/views/desktop/desktop_window_view.h"
 #include "views/widget/widget.h"
 
 ChromeBrowserPartsViews::ChromeBrowserPartsViews()

chrome/browser/chromeos/login/webui_login_view.cc

@@ -24,7 +24,7 @@
 #include "content/browser/tab_contents/tab_contents.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
-#include "views/desktop/desktop_window_view.h"
+#include "ui/views/desktop/desktop_window_view.h"
 #include "views/widget/widget.h"
 
 #if defined(TOOLKIT_USES_GTK)

chrome/browser/renderer_host/render_widget_host_view_views.h

@@ -22,9 +22,9 @@
 #include "ui/base/ime/text_input_client.h"
 #include "ui/gfx/compositor/compositor_observer.h"
 #include "ui/gfx/native_widget_types.h"
+#include "ui/views/touchui/touch_selection_controller.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/events/event.h"
-#include "views/touchui/touch_selection_controller.h"
 #include "views/view.h"
 #include "webkit/glue/webcursor.h"
 

chrome/browser/ui/touch/frame/touch_browser_frame_view.cc

@@ -4,9 +4,9 @@
 
 #include "chrome/browser/ui/touch/frame/touch_browser_frame_view.h"
 
-#include "views/controls/button/image_button.h"
-#include "views/desktop/desktop_window_view.h"
 #include "ui/gfx/compositor/layer.h"
+#include "ui/views/desktop/desktop_window_view.h"
+#include "views/controls/button/image_button.h"
 
 // static
 const char TouchBrowserFrameView::kViewClassName[] =

chrome/browser/ui/touch/sensors/screen_orientation_listener.cc

@@ -11,7 +11,7 @@
 #include "ui/gfx/compositor/layer_animator.h"
 #include "ui/gfx/compositor/screen_rotation.h"
 #include "ui/gfx/interpolated_transform.h"
-#include "views/desktop/desktop_window_view.h"
+#include "ui/views/desktop/desktop_window_view.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/desktop.h"

chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/memory/singleton.h"
-#include "views/desktop/desktop_window_view.h"
+#include "ui/views/desktop/desktop_window_view.h"
 #include "views/widget/widget.h"
 
 class KeyboardWidget;

views/desktop/desktop_background.cc → ui/views/desktop/desktop_background.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 "views/desktop/desktop_background.h"
+#include "ui/views/desktop/desktop_background.h"
 
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/path.h"

views/desktop/desktop_background.h → ui/views/desktop/desktop_background.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_DESKTOP_DESKTOP_BACKGROUND_H_
-#define VIEWS_DESKTOP_DESKTOP_BACKGROUND_H_
+#ifndef UI_VIEWS_DESKTOP_DESKTOP_BACKGROUND_H_
+#define UI_VIEWS_DESKTOP_DESKTOP_BACKGROUND_H_
 
 #include "base/compiler_specific.h"
 #include "views/background.h"
@@ -26,4 +26,4 @@ class DesktopBackground : public Background {
 }  // namespace desktop
 }  // namespace views
 
-#endif  // VIEWS_DESKTOP_DESKTOP_BACKGROUND_H_
+#endif  // UI_VIEWS_DESKTOP_DESKTOP_BACKGROUND_H_

views/desktop/desktop_main.cc → ui/views/desktop/desktop_main.cc

@@ -9,8 +9,8 @@
 #include "base/utf_string_conversions.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
-#include "views/desktop/desktop_views_delegate.h"
-#include "views/desktop/desktop_window_view.h"
+#include "ui/views/desktop/desktop_views_delegate.h"
+#include "ui/views/desktop/desktop_window_view.h"
 #include "views/focus/accelerator_handler.h"
 #include "views/widget/widget.h"
 

views/desktop/desktop_views_delegate.cc → ui/views/desktop/desktop_views_delegate.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 "views/desktop/desktop_views_delegate.h"
+#include "ui/views/desktop/desktop_views_delegate.h"
 
 #include "base/logging.h"
-#include "views/desktop/desktop_window_view.h"
+#include "ui/views/desktop/desktop_window_view.h"
 
 namespace views {
 namespace desktop {

views/desktop/desktop_views_delegate.h → ui/views/desktop/desktop_views_delegate.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_DESKTOP_DESKTOP_VIEWS_DELEGATE_H_
-#define VIEWS_DESKTOP_DESKTOP_VIEWS_DELEGATE_H_
+#ifndef UI_VIEWS_DESKTOP_DESKTOP_VIEWS_DELEGATE_H_
+#define UI_VIEWS_DESKTOP_DESKTOP_VIEWS_DELEGATE_H_
 
 #include "base/compiler_specific.h"
 #include "views/views_delegate.h"
@@ -45,8 +45,7 @@ class DesktopViewsDelegate : public ViewsDelegate {
   DISALLOW_COPY_AND_ASSIGN(DesktopViewsDelegate);
 };
 
-
 }  // namespace desktop
 }  // namespace views
 
-#endif  // VIEWS_DESKTOP_DESKTOP_VIEWS_DELEGATE_H_
+#endif  // UI_VIEWS_DESKTOP_DESKTOP_VIEWS_DELEGATE_H_

views/desktop/desktop_window_manager.cc → ui/views/desktop/desktop_window_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 "views/desktop/desktop_window_manager.h"
+#include "ui/views/desktop/desktop_window_manager.h"
 
 #include "ui/base/hit_test.h"
 #include "ui/gfx/point.h"

views/desktop/desktop_window_manager.h → ui/views/desktop/desktop_window_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 VIEWS_DESKTOP_DESKTOP_WINDOW_MANAGER_H_
-#define VIEWS_DESKTOP_DESKTOP_WINDOW_MANAGER_H_
+#ifndef UI_VIEWS_DESKTOP_DESKTOP_WINDOW_MANAGER_H_
+#define UI_VIEWS_DESKTOP_DESKTOP_WINDOW_MANAGER_H_
 #pragma once
 
 #include <vector>
@@ -96,4 +96,4 @@ class WindowController {
 }  // namespace desktop
 }  // namespace views
 
-#endif  // VIEWS_DESKTOP_DESKTOP_WINDOW_MANAGER_H_
+#endif  // UI_VIEWS_DESKTOP_DESKTOP_WINDOW_MANAGER_H_

views/desktop/desktop_window_view.cc → ui/views/desktop/desktop_window_view.cc

@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/desktop/desktop_window_view.h"
+#include "ui/views/desktop/desktop_window_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/layer_animator.h"
 #include "ui/gfx/transform.h"
+#include "ui/views/desktop/desktop_background.h"
+#include "ui/views/desktop/desktop_window_manager.h"
 #include "ui/views/window/native_frame_view.h"
-#include "views/desktop/desktop_background.h"
-#include "views/desktop/desktop_window_manager.h"
 #include "views/widget/native_widget_view.h"
 #include "views/widget/native_widget_views.h"
 #include "views/widget/widget.h"

views/desktop/desktop_window_view.h → ui/views/desktop/desktop_window_view.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_DESKTOP_DESKTOP_WINDOW_VIEW_H_
-#define VIEWS_DESKTOP_DESKTOP_WINDOW_VIEW_H_
+#ifndef UI_VIEWS_DESKTOP_DESKTOP_WINDOW_VIEW_H_
+#define UI_VIEWS_DESKTOP_DESKTOP_WINDOW_VIEW_H_
 
 #include "base/observer_list.h"
 #include "ui/gfx/compositor/layer_animation_observer.h"
@@ -97,4 +97,4 @@ class DesktopWindowView : public WidgetDelegateView,
 }  // namespace desktop
 }  // namespace views
 
-#endif  // VIEWS_DESKTOP_DESKTOP_WINDOW_VIEW_H_
+#endif  // UI_VIEWS_DESKTOP_DESKTOP_WINDOW_VIEW_H_

views/touchui/gesture_manager.cc → ui/views/touchui/gesture_manager.cc

@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/touchui/gesture_manager.h"
+#include "ui/views/touchui/gesture_manager.h"
+
 #ifndef NDEBUG
 #include <ostream>
 #endif

views/touchui/gesture_manager.h → ui/views/touchui/gesture_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 VIEWS_TOUCHUI_GESTURE_MANAGER_H_
-#define VIEWS_TOUCHUI_GESTURE_MANAGER_H_
+#ifndef UI_VIEWS_TOUCHUI_GESTURE_MANAGER_H_
+#define UI_VIEWS_TOUCHUI_GESTURE_MANAGER_H_
 #pragma once
 
 #include "base/memory/singleton.h"
@@ -51,7 +51,6 @@ class VIEWS_EXPORT GestureManager {
   DISALLOW_COPY_AND_ASSIGN(GestureManager);
 };
 
-
 }  // namespace views
 
-#endif  // VIEWS_TOUCHUI_GESTURE_MANAGER_H_
+#endif  // UI_VIEWS_TOUCHUI_GESTURE_MANAGER_H_

views/touchui/touch_selection_controller.cc → ui/views/touchui/touch_selection_controller.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 "views/touchui/touch_selection_controller.h"
+#include "ui/views/touchui/touch_selection_controller.h"
 
 namespace views {
 
@@ -13,4 +13,4 @@ TouchSelectionController* TouchSelectionController::create(
 }
 #endif
 
-}  // namespace views.
+}  // namespace views

views/touchui/touch_selection_controller.h → ui/views/touchui/touch_selection_controller.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_TOUCHUI_TOUCH_SELECTION_CONTROLLER_H_
-#define VIEWS_TOUCHUI_TOUCH_SELECTION_CONTROLLER_H_
+#ifndef UI_VIEWS_TOUCHUI_TOUCH_SELECTION_CONTROLLER_H_
+#define UI_VIEWS_TOUCHUI_TOUCH_SELECTION_CONTROLLER_H_
 #pragma once
 
 #include "ui/base/models/simple_menu_model.h"
@@ -53,4 +53,4 @@ class VIEWS_EXPORT TouchSelectionController {
 
 }  // namespace views
 
-#endif  // VIEWS_TOUCHUI_TOUCH_SELECTION_CONTROLLER_H_
+#endif  // UI_VIEWS_TOUCHUI_TOUCH_SELECTION_CONTROLLER_H_

views/touchui/touch_selection_controller_impl.cc → ui/views/touchui/touch_selection_controller_impl.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 "views/touchui/touch_selection_controller_impl.h"
+#include "ui/views/touchui/touch_selection_controller_impl.h"
 
 #include "base/time.h"
 #include "base/utf_string_conversions.h"

views/touchui/touch_selection_controller_impl.h → ui/views/touchui/touch_selection_controller_impl.h

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_TOUCHUI_TOUCH_SELECTION_CONTROLLER_IMPL_H_
-#define VIEWS_TOUCHUI_TOUCH_SELECTION_CONTROLLER_IMPL_H_
+#ifndef UI_UI_VIEWS_TOUCHUI_TOUCH_SELECTION_CONTROLLER_IMPL_H_
+#define UI_UI_VIEWS_TOUCHUI_TOUCH_SELECTION_CONTROLLER_IMPL_H_
 #pragma once
 
 #include "base/timer.h"
 #include "ui/gfx/point.h"
-#include "views/touchui/touch_selection_controller.h"
+#include "ui/views/touchui/touch_selection_controller.h"
 #include "views/view.h"
 #include "views/views_export.h"
 
@@ -82,4 +82,4 @@ class VIEWS_EXPORT TouchSelectionControllerImpl
 
 }  // namespace views
 
-#endif  // VIEWS_TOUCHUI_TOUCH_SELECTION_CONTROLLER_IMPL_H_
+#endif  // UI_UI_VIEWS_TOUCHUI_TOUCH_SELECTION_CONTROLLER_IMPL_H_

views/touchui/touch_selection_controller_impl_unittest.cc → ui/views/touchui/touch_selection_controller_impl_unittest.cc

@@ -6,11 +6,11 @@
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/render_text.h"
+#include "ui/views/touchui/touch_selection_controller.h"
+#include "ui/views/touchui/touch_selection_controller_impl.h"
 #include "views/controls/textfield/native_textfield_views.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/test/views_test_base.h"
-#include "views/touchui/touch_selection_controller.h"
-#include "views/touchui/touch_selection_controller_impl.h"
 #include "views/widget/widget.h"
 
 namespace views {

views/controls/textfield/native_textfield_views.h

@@ -11,12 +11,12 @@
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/gfx/font.h"
+#include "ui/views/touchui/touch_selection_controller.h"
 #include "views/border.h"
 #include "views/context_menu_controller.h"
 #include "views/controls/textfield/native_textfield_wrapper.h"
 #include "views/controls/textfield/textfield_views_model.h"
 #include "views/drag_controller.h"
-#include "views/touchui/touch_selection_controller.h"
 #include "views/view.h"
 
 namespace base {

views/view_unittest.cc

@@ -11,8 +11,8 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/keycodes/keyboard_codes.h"
-#include "ui/base/models/simple_menu_model.h"
 #include "ui/base/models/accelerator.h"
+#include "ui/base/models/simple_menu_model.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/compositor/compositor.h"
 #include "ui/gfx/compositor/layer.h"
@@ -21,6 +21,7 @@
 #include "ui/gfx/compositor/test_texture.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/transform.h"
+#include "ui/views/touchui/gesture_manager.h"
 #include "ui/views/window/dialog_delegate.h"
 #include "views/background.h"
 #include "views/controls/button/button_dropdown.h"
@@ -32,7 +33,6 @@
 #include "views/focus/accelerator_handler.h"
 #include "views/focus/view_storage.h"
 #include "views/test/views_test_base.h"
-#include "views/touchui/gesture_manager.h"
 #include "views/view.h"
 #include "views/views_delegate.h"
 #include "views/widget/native_widget.h"

views/views.gyp

@@ -326,12 +326,6 @@
         'painter.h',
         'repeat_controller.cc',
         'repeat_controller.h',
-        'touchui/gesture_manager.cc',
-        'touchui/gesture_manager.h',
-        'touchui/touch_selection_controller.cc',
-        'touchui/touch_selection_controller.h',
-        'touchui/touch_selection_controller_impl.cc',
-        'touchui/touch_selection_controller_impl.h',
         'view.cc',
         'view.h',
         'view_aura.cc',
@@ -396,6 +390,12 @@
         '../ui/views/animation/bounds_animator.h',
         '../ui/views/accessibility/native_view_accessibility_win.cc',
         '../ui/views/accessibility/native_view_accessibility_win.h',
+        '../ui/views/touchui/gesture_manager.cc',
+        '../ui/views/touchui/gesture_manager.h',
+        '../ui/views/touchui/touch_selection_controller.cc',
+        '../ui/views/touchui/touch_selection_controller.h',
+        '../ui/views/touchui/touch_selection_controller_impl.cc',
+        '../ui/views/touchui/touch_selection_controller_impl.h',
         '../ui/views/window/client_view.cc',
         '../ui/views/window/client_view.h',
         '../ui/views/window/custom_frame_view.cc',
@@ -504,8 +504,8 @@
         }],
         ['touchui==0', {
           'sources!': [
-            'touchui/touch_selection_controller_impl.cc',
-            'touchui/touch_selection_controller_impl.h',
+            '../ui/views/touchui/touch_selection_controller_impl.cc',
+            '../ui/views/touchui/touch_selection_controller_impl.h',
           ],
         }],
         ['touchui==0 and use_aura==0', {
@@ -575,6 +575,7 @@
       ],
       'sources': [
         '../ui/views/animation/bounds_animator_unittest.cc',
+        '../ui/views/touchui/touch_selection_controller_impl_unittest.cc',
         'accessible_pane_view_unittest.cc',
         'bubble/bubble_delegate_unittest.cc',
         'bubble/bubble_frame_view_unittest.cc',
@@ -598,7 +599,6 @@
         'run_all_unittests.cc',
         'test/test_views_delegate.cc',
         'test/test_views_delegate.h',
-        'touchui/touch_selection_controller_impl_unittest.cc',
         'view_unittest.cc',
         'widget/native_widget_test_utils.h',
         'widget/native_widget_test_utils_aura.cc',
@@ -634,7 +634,7 @@
         }],
         ['touchui==0', {
           'sources!': [
-            'touchui/touch_selection_controller_impl_unittest.cc',
+            '../ui/views/touchui/touch_selection_controller_impl_unittest.cc',
           ],
         }],
         ['OS=="win"', {
@@ -794,12 +794,12 @@
         '..',
       ],
       'sources': [
-        'desktop/desktop_background.cc',
-        'desktop/desktop_background.h',
-        'desktop/desktop_window_manager.cc',
-        'desktop/desktop_window_manager.h',
-        'desktop/desktop_window_view.cc',
-        'desktop/desktop_window_view.h',
+        '../ui/views/desktop/desktop_background.cc',
+        '../ui/views/desktop/desktop_background.h',
+        '../ui/views/desktop/desktop_window_manager.cc',
+        '../ui/views/desktop/desktop_window_manager.h',
+        '../ui/views/desktop/desktop_window_view.cc',
+        '../ui/views/desktop/desktop_window_view.h',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
@@ -850,9 +850,9 @@
         '..',
       ],
       'sources': [
-        'desktop/desktop_main.cc',
-        'desktop/desktop_views_delegate.cc',
-        'desktop/desktop_views_delegate.h',
+        '../ui/views/desktop/desktop_main.cc',
+        '../ui/views/desktop/desktop_views_delegate.cc',
+        '../ui/views/desktop/desktop_views_delegate.h',
         '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',

views/widget/root_view.cc

@@ -13,9 +13,9 @@
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/compositor/layer.h"
+#include "ui/views/touchui/gesture_manager.h"
 #include "views/focus/view_storage.h"
 #include "views/layout/fill_layout.h"
-#include "views/touchui/gesture_manager.h"
 #include "views/widget/widget.h"
 
 namespace views {