summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-30 13:24:35 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-30 13:24:35 +0000
commite73fd5d32e9206d40c4c9c016834c0ed5f09ecdf (patch)
treedf2f0d93c68ad9e732ce9811a87cff81115bd116
parentc63925ad27af4a2072c5b08a64b3bbfbc178744a (diff)
downloadchromium_src-e73fd5d32e9206d40c4c9c016834c0ed5f09ecdf.zip
chromium_src-e73fd5d32e9206d40c4c9c016834c0ed5f09ecdf.tar.gz
chromium_src-e73fd5d32e9206d40c4c9c016834c0ed5f09ecdf.tar.bz2
views: Move some random files from views/ to ui/views/.
BUG=104039 R=ben@chromium.org Review URL: http://codereview.chromium.org/8735009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112208 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/bookmarks/bookmark_utils.cc2
-rw-r--r--chrome/browser/chromeos/frame/browser_view.h2
-rw-r--r--chrome/browser/download/download_util.cc2
-rw-r--r--chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc4
-rw-r--r--chrome/browser/ui/views/bookmarks/bookmark_bar_view.h4
-rw-r--r--chrome/browser/ui/views/bookmarks/bookmark_editor_view.h2
-rw-r--r--chrome/browser/ui/views/browser_actions_container.cc4
-rw-r--r--chrome/browser/ui/views/browser_actions_container.h2
-rw-r--r--chrome/browser/ui/views/download/download_shelf_view.h2
-rw-r--r--chrome/browser/ui/views/location_bar/location_bar_view.cc2
-rw-r--r--chrome/browser/ui/views/location_bar/location_bar_view.h2
-rw-r--r--chrome/browser/ui/views/omnibox/omnibox_view_win.cc2
-rw-r--r--chrome/browser/ui/views/reload_button.cc2
-rw-r--r--chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc2
-rw-r--r--chrome/browser/ui/views/tabs/base_tab.h2
-rw-r--r--chrome/browser/ui/views/tabs/tab_strip.h2
-rw-r--r--chrome/browser/ui/views/task_manager_view.cc2
-rw-r--r--ui/aura_shell/examples/window_type_launcher.h2
-rw-r--r--ui/views/context_menu_controller.h (renamed from views/context_menu_controller.h)6
-rw-r--r--ui/views/controls/menu/menu_controller.cc2
-rw-r--r--ui/views/controls/scrollbar/base_scroll_bar.h2
-rw-r--r--ui/views/controls/textfield/native_textfield_views.cc2
-rw-r--r--ui/views/controls/textfield/native_textfield_views.h10
-rw-r--r--ui/views/controls/textfield/native_textfield_win.cc2
-rw-r--r--ui/views/debug_utils.cc (renamed from views/debug_utils.cc)2
-rw-r--r--ui/views/debug_utils.h (renamed from views/debug_utils.h)7
-rw-r--r--ui/views/drag_controller.h (renamed from views/drag_controller.h)8
-rw-r--r--ui/views/drag_utils.cc (renamed from views/drag_utils.cc)12
-rw-r--r--ui/views/drag_utils.h (renamed from views/drag_utils.h)16
-rw-r--r--ui/views/drag_utils_aura.cc (renamed from views/drag_utils_aura.cc)13
-rw-r--r--ui/views/drag_utils_gtk.cc (renamed from views/drag_utils_gtk.cc)15
-rw-r--r--ui/views/drag_utils_win.cc (renamed from views/drag_utils_win.cc)13
-rw-r--r--ui/views/metrics.cc (renamed from views/metrics.cc)2
-rw-r--r--ui/views/metrics.h (renamed from views/metrics.h)6
-rw-r--r--ui/views/metrics_aura.cc (renamed from views/metrics_aura.cc)2
-rw-r--r--ui/views/metrics_gtk.cc (renamed from views/metrics_gtk.cc)2
-rw-r--r--ui/views/metrics_win.cc (renamed from views/metrics_win.cc)2
-rw-r--r--ui/views/mouse_watcher.cc (renamed from views/mouse_watcher.cc)2
-rw-r--r--ui/views/mouse_watcher.h (renamed from views/mouse_watcher.h)6
-rw-r--r--views/view.cc4
-rw-r--r--views/views.gyp34
41 files changed, 101 insertions, 111 deletions
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc
index 99b7c9f..3d4b806 100644
--- a/chrome/browser/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_utils.cc
@@ -41,10 +41,10 @@
#if defined(TOOLKIT_VIEWS)
#include "ui/base/dragdrop/os_exchange_data.h"
+#include "ui/views/drag_utils.h"
#include "ui/views/events/event.h"
#include "ui/views/widget/native_widget.h"
#include "ui/views/widget/widget.h"
-#include "views/drag_utils.h"
#endif
#if defined(TOOLKIT_GTK)
diff --git a/chrome/browser/chromeos/frame/browser_view.h b/chrome/browser/chromeos/frame/browser_view.h
index 3b7a435..62aae9e 100644
--- a/chrome/browser/chromeos/frame/browser_view.h
+++ b/chrome/browser/chromeos/frame/browser_view.h
@@ -13,8 +13,8 @@
#include "chrome/browser/chromeos/status/status_area_button.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/views/frame/browser_view.h"
+#include "ui/views/context_menu_controller.h"
#include "ui/views/controls/menu/menu_listener.h"
-#include "views/context_menu_controller.h"
class StatusAreaButton;
diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc
index 202c288..c622f85 100644
--- a/chrome/browser/download/download_util.cc
+++ b/chrome/browser/download/download_util.cc
@@ -58,7 +58,7 @@
#if defined(TOOLKIT_VIEWS)
#include "ui/base/dragdrop/os_exchange_data.h"
-#include "views/drag_utils.h"
+#include "ui/views/drag_utils.h"
#endif
#if defined(TOOLKIT_USES_GTK)
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index 69c8c79..ae5dacd 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -56,10 +56,10 @@
#include "ui/views/controls/button/menu_button.h"
#include "ui/views/controls/label.h"
#include "ui/views/controls/menu/menu_item_view.h"
+#include "ui/views/drag_utils.h"
+#include "ui/views/metrics.h"
#include "ui/views/widget/tooltip_manager.h"
#include "ui/views/widget/widget.h"
-#include "views/drag_utils.h"
-#include "views/metrics.h"
#include "views/view_constants.h"
using views::CustomButton;
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
index 87d8ec6..2cc33b6 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
@@ -22,10 +22,10 @@
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
#include "ui/base/animation/animation_delegate.h"
+#include "ui/views/context_menu_controller.h"
#include "ui/views/controls/button/button.h"
#include "ui/views/controls/menu/view_menu_delegate.h"
-#include "views/context_menu_controller.h"
-#include "views/drag_controller.h"
+#include "ui/views/drag_controller.h"
class BookmarkContextMenu;
class Browser;
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h
index 4761a67..8cffaed 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h
@@ -16,12 +16,12 @@
#include "testing/gtest/include/gtest/gtest_prod.h"
#include "ui/base/models/simple_menu_model.h"
#include "ui/base/models/tree_node_model.h"
+#include "ui/views/context_menu_controller.h"
#include "ui/views/controls/button/button.h"
#include "ui/views/controls/textfield/textfield.h"
#include "ui/views/controls/textfield/textfield_controller.h"
#include "ui/views/controls/tree/tree_view.h"
#include "ui/views/window/dialog_delegate.h"
-#include "views/context_menu_controller.h"
namespace views {
class Label;
diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc
index 137116e..93b9d20 100644
--- a/chrome/browser/ui/views/browser_actions_container.cc
+++ b/chrome/browser/ui/views/browser_actions_container.cc
@@ -49,8 +49,8 @@
#include "ui/views/controls/menu/menu_model_adapter.h"
#include "ui/views/controls/menu/menu_runner.h"
#include "ui/views/controls/resize_area.h"
-#include "views/drag_utils.h"
-#include "views/metrics.h"
+#include "ui/views/drag_utils.h"
+#include "ui/views/metrics.h"
// Horizontal spacing between most items in the container, as well as after the
// last item or chevron (if visible).
diff --git a/chrome/browser/ui/views/browser_actions_container.h b/chrome/browser/ui/views/browser_actions_container.h
index 1d0dd71..cf03078 100644
--- a/chrome/browser/ui/views/browser_actions_container.h
+++ b/chrome/browser/ui/views/browser_actions_container.h
@@ -26,7 +26,7 @@
#include "ui/views/controls/button/menu_button.h"
#include "ui/views/controls/menu/view_menu_delegate.h"
#include "ui/views/controls/resize_area_delegate.h"
-#include "views/drag_controller.h"
+#include "ui/views/drag_controller.h"
#include "views/view.h"
class Browser;
diff --git a/chrome/browser/ui/views/download/download_shelf_view.h b/chrome/browser/ui/views/download/download_shelf_view.h
index 1d88941..a69f7fe 100644
--- a/chrome/browser/ui/views/download/download_shelf_view.h
+++ b/chrome/browser/ui/views/download/download_shelf_view.h
@@ -14,8 +14,8 @@
#include "ui/base/animation/animation_delegate.h"
#include "ui/views/controls/button/button.h"
#include "ui/views/controls/link_listener.h"
+#include "ui/views/mouse_watcher.h"
#include "views/accessible_pane_view.h"
-#include "views/mouse_watcher.h"
class BaseDownloadItemModel;
class Browser;
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index 14d6592..848cc5c 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -58,7 +58,7 @@
#include "ui/gfx/skia_util.h"
#include "ui/views/controls/label.h"
#include "ui/views/controls/textfield/native_textfield_views.h"
-#include "views/drag_utils.h"
+#include "ui/views/drag_utils.h"
#if !defined(OS_CHROMEOS)
#include "chrome/browser/ui/views/first_run_bubble.h"
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h
index 868a3ce..6578725 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.h
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
@@ -24,7 +24,7 @@
#include "ui/gfx/font.h"
#include "ui/gfx/rect.h"
#include "ui/views/controls/native/native_view_host.h"
-#include "views/drag_controller.h"
+#include "ui/views/drag_controller.h"
#if defined(USE_AURA)
#include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
index 379d94d..30a1ea4 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
@@ -53,8 +53,8 @@
#include "ui/gfx/canvas.h"
#include "ui/gfx/canvas_skia.h"
#include "ui/views/controls/textfield/native_textfield_win.h"
+#include "ui/views/drag_utils.h"
#include "ui/views/widget/widget.h"
-#include "views/drag_utils.h"
#pragma comment(lib, "oleacc.lib") // Needed for accessibility support.
#pragma comment(lib, "riched20.lib") // Needed for the richedit control.
diff --git a/chrome/browser/ui/views/reload_button.cc b/chrome/browser/ui/views/reload_button.cc
index 460bc0a..34b7857 100644
--- a/chrome/browser/ui/views/reload_button.cc
+++ b/chrome/browser/ui/views/reload_button.cc
@@ -11,7 +11,7 @@
#include "chrome/browser/ui/views/location_bar/location_bar_view.h"
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
-#include "views/metrics.h"
+#include "ui/views/metrics.h"
// static
const char ReloadButton::kViewClassName[] = "browser/ui/views/ReloadButton";
diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc
index e0516415..2711aef 100644
--- a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc
+++ b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc
@@ -27,7 +27,7 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/content_browser_client.h"
#include "net/base/net_util.h"
-#include "views/drag_utils.h"
+#include "ui/views/drag_utils.h"
#include "webkit/glue/webdropdata.h"
using content::BrowserThread;
diff --git a/chrome/browser/ui/views/tabs/base_tab.h b/chrome/browser/ui/views/tabs/base_tab.h
index 7ab2b37..bcf92c6 100644
--- a/chrome/browser/ui/views/tabs/base_tab.h
+++ b/chrome/browser/ui/views/tabs/base_tab.h
@@ -10,8 +10,8 @@
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/ui/views/tabs/tab_renderer_data.h"
#include "ui/base/animation/animation_delegate.h"
+#include "ui/views/context_menu_controller.h"
#include "ui/views/controls/button/button.h"
-#include "views/context_menu_controller.h"
#include "views/view.h"
class BaseTab;
diff --git a/chrome/browser/ui/views/tabs/tab_strip.h b/chrome/browser/ui/views/tabs/tab_strip.h
index 11b5869..5b8a619 100644
--- a/chrome/browser/ui/views/tabs/tab_strip.h
+++ b/chrome/browser/ui/views/tabs/tab_strip.h
@@ -14,7 +14,7 @@
#include "ui/gfx/point.h"
#include "ui/gfx/rect.h"
#include "ui/views/controls/button/image_button.h"
-#include "views/mouse_watcher.h"
+#include "ui/views/mouse_watcher.h"
class Tab;
class TabStripSelectionModel;
diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc
index 1f06ced..b864725 100644
--- a/chrome/browser/ui/views/task_manager_view.cc
+++ b/chrome/browser/ui/views/task_manager_view.cc
@@ -24,6 +24,7 @@
#include "ui/base/accelerators/accelerator.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/models/table_model_observer.h"
+#include "ui/views/context_menu_controller.h"
#include "ui/views/controls/button/text_button.h"
#include "ui/views/controls/link.h"
#include "ui/views/controls/link_listener.h"
@@ -34,7 +35,6 @@
#include "ui/views/widget/widget.h"
#include "ui/views/window/dialog_delegate.h"
#include "views/background.h"
-#include "views/context_menu_controller.h"
// The task manager window default size.
static const int kDefaultWidth = 460;
diff --git a/ui/aura_shell/examples/window_type_launcher.h b/ui/aura_shell/examples/window_type_launcher.h
index b597a24..8e41587 100644
--- a/ui/aura_shell/examples/window_type_launcher.h
+++ b/ui/aura_shell/examples/window_type_launcher.h
@@ -6,10 +6,10 @@
#define UI_AURA_SHELL_EXAMPLES_WINDOW_TYPE_LAUNCHER_H_
#pragma once
+#include "ui/views/context_menu_controller.h"
#include "ui/views/controls/button/button.h"
#include "ui/views/controls/menu/menu_delegate.h"
#include "ui/views/widget/widget_delegate.h"
-#include "views/context_menu_controller.h"
namespace views {
class MenuRunner;
diff --git a/views/context_menu_controller.h b/ui/views/context_menu_controller.h
index 9f0e6c4..577ec62 100644
--- a/views/context_menu_controller.h
+++ b/ui/views/context_menu_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_CONTEXT_MENU_CONTROLLER_H_
-#define VIEWS_CONTEXT_MENU_CONTROLLER_H_
+#ifndef UI_VIEWS_CONTEXT_MENU_CONTROLLER_H_
+#define UI_VIEWS_CONTEXT_MENU_CONTROLLER_H_
#pragma once
#include "views/views_export.h"
@@ -44,4 +44,4 @@ class VIEWS_EXPORT ContextMenuController {
} // namespace views
-#endif // VIEWS_CONTEXT_MENU_CONTROLLER_H_
+#endif // UI_VIEWS_CONTEXT_MENU_CONTROLLER_H_
diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc
index 9678a81..bb96e93 100644
--- a/ui/views/controls/menu/menu_controller.cc
+++ b/ui/views/controls/menu/menu_controller.cc
@@ -18,9 +18,9 @@
#include "ui/views/controls/menu/menu_controller_delegate.h"
#include "ui/views/controls/menu/menu_scroll_view_container.h"
#include "ui/views/controls/menu/submenu_view.h"
+#include "ui/views/drag_utils.h"
#include "ui/views/widget/root_view.h"
#include "ui/views/widget/widget.h"
-#include "views/drag_utils.h"
#include "views/view_constants.h"
#include "views/views_delegate.h"
diff --git a/ui/views/controls/scrollbar/base_scroll_bar.h b/ui/views/controls/scrollbar/base_scroll_bar.h
index 8dee9b9..09d581e 100644
--- a/ui/views/controls/scrollbar/base_scroll_bar.h
+++ b/ui/views/controls/scrollbar/base_scroll_bar.h
@@ -6,10 +6,10 @@
#define UI_VIEWS_CONTROLS_SCROLLBAR_BASE_SCROLL_BAR_H_
#pragma once
+#include "ui/views/context_menu_controller.h"
#include "ui/views/controls/button/image_button.h"
#include "ui/views/controls/menu/menu_delegate.h"
#include "ui/views/controls/scrollbar/scroll_bar.h"
-#include "views/context_menu_controller.h"
#include "views/repeat_controller.h"
namespace views {
diff --git a/ui/views/controls/textfield/native_textfield_views.cc b/ui/views/controls/textfield/native_textfield_views.cc
index d5d0b56..b324430 100644
--- a/ui/views/controls/textfield/native_textfield_views.cc
+++ b/ui/views/controls/textfield/native_textfield_views.cc
@@ -27,10 +27,10 @@
#include "ui/views/controls/textfield/textfield_views_model.h"
#include "ui/views/events/event.h"
#include "ui/views/ime/input_method.h"
+#include "ui/views/metrics.h"
#include "ui/views/widget/widget.h"
#include "views/background.h"
#include "views/border.h"
-#include "views/metrics.h"
#include "views/views_delegate.h"
#if defined(OS_LINUX)
diff --git a/ui/views/controls/textfield/native_textfield_views.h b/ui/views/controls/textfield/native_textfield_views.h
index 2cae9f4..a9cfbb8 100644
--- a/ui/views/controls/textfield/native_textfield_views.h
+++ b/ui/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/context_menu_controller.h"
#include "ui/views/controls/textfield/native_textfield_wrapper.h"
#include "ui/views/controls/textfield/textfield_views_model.h"
+#include "ui/views/drag_controller.h"
#include "ui/views/touchui/touch_selection_controller.h"
#include "views/border.h"
-#include "views/context_menu_controller.h"
-#include "views/drag_controller.h"
#include "views/view.h"
namespace base {
@@ -60,8 +60,8 @@ class VIEWS_EXPORT NativeTextfieldViews : public TouchSelectionClientView,
virtual bool OnKeyPressed(const KeyEvent& event) OVERRIDE;
virtual bool GetDropFormats(
int* formats,
- std::set<OSExchangeData::CustomFormat>* custom_formats) OVERRIDE;
- virtual bool CanDrop(const OSExchangeData& data) OVERRIDE;
+ std::set<ui::OSExchangeData::CustomFormat>* custom_formats) OVERRIDE;
+ virtual bool CanDrop(const ui::OSExchangeData& data) OVERRIDE;
virtual int OnDragUpdated(const DropTargetEvent& event) OVERRIDE;
virtual int OnPerformDrop(const DropTargetEvent& event) OVERRIDE;
virtual void OnDragDone() OVERRIDE;
@@ -82,7 +82,7 @@ class VIEWS_EXPORT NativeTextfieldViews : public TouchSelectionClientView,
// Overridden from DragController:
virtual void WriteDragDataForView(View* sender,
const gfx::Point& press_pt,
- OSExchangeData* data) OVERRIDE;
+ ui::OSExchangeData* data) OVERRIDE;
virtual int GetDragOperationsForView(View* sender,
const gfx::Point& p) OVERRIDE;
virtual bool CanStartDragForView(View* sender,
diff --git a/ui/views/controls/textfield/native_textfield_win.cc b/ui/views/controls/textfield/native_textfield_win.cc
index 3b598e1..a8164a2 100644
--- a/ui/views/controls/textfield/native_textfield_win.cc
+++ b/ui/views/controls/textfield/native_textfield_win.cc
@@ -31,8 +31,8 @@
#include "ui/views/controls/textfield/textfield.h"
#include "ui/views/controls/textfield/textfield_controller.h"
#include "ui/views/focus/focus_manager.h"
+#include "ui/views/metrics.h"
#include "ui/views/widget/widget.h"
-#include "views/metrics.h"
#include "views/views_delegate.h"
namespace views {
diff --git a/views/debug_utils.cc b/ui/views/debug_utils.cc
index b490736..23a75d2 100644
--- a/views/debug_utils.cc
+++ b/ui/views/debug_utils.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/debug_utils.h"
+#include "ui/views/debug_utils.h"
#include "base/logging.h"
#include "base/utf_string_conversions.h"
diff --git a/views/debug_utils.h b/ui/views/debug_utils.h
index ca82711..b953c94 100644
--- a/views/debug_utils.h
+++ b/ui/views/debug_utils.h
@@ -2,8 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef VIEWS_DEBUG_UTILS_H_
-#define VIEWS_DEBUG_UTILS_H_
+#ifndef UI_VIEWS_DEBUG_UTILS_H_
+#define UI_VIEWS_DEBUG_UTILS_H_
+#pragma once
namespace views {
@@ -21,4 +22,4 @@ void PrintFocusHierarchy(const View* view);
} // namespace views
-#endif // VIEWS_DEBUG_UTILS_H_
+#endif // UI_VIEWS_DEBUG_UTILS_H_
diff --git a/views/drag_controller.h b/ui/views/drag_controller.h
index 1c74e26..94946d7 100644
--- a/views/drag_controller.h
+++ b/ui/views/drag_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_EVENTS_DRAG_CONTROLLER_H_
-#define VIEWS_EVENTS_DRAG_CONTROLLER_H_
+#ifndef UI_VIEWS_DRAG_CONTROLLER_H_
+#define UI_VIEWS_DRAG_CONTROLLER_H_
#pragma once
#include "views/views_export.h"
@@ -27,7 +27,7 @@ class VIEWS_EXPORT DragController {
// Writes the data for the drag.
virtual void WriteDragDataForView(View* sender,
const gfx::Point& press_pt,
- OSExchangeData* data) = 0;
+ ui::OSExchangeData* data) = 0;
// Returns the supported drag operations (see DragDropTypes for possible
// values). A drag is only started if this returns a non-zero value.
@@ -47,4 +47,4 @@ class VIEWS_EXPORT DragController {
} // namespace views
-#endif // VIEWS_EVENTS_DRAG_CONTROLLER_H_
+#endif // UI_VIEWS_DRAG_CONTROLLER_H_
diff --git a/views/drag_utils.cc b/ui/views/drag_utils.cc
index 1ab4c79..181a599 100644
--- a/views/drag_utils.cc
+++ b/ui/views/drag_utils.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/drag_utils.h"
+#include "ui/views/drag_utils.h"
#include "base/file_util.h"
#include "base/logging.h"
@@ -15,8 +15,6 @@
#include "ui/gfx/font.h"
#include "ui/views/controls/button/text_button.h"
-using ui::OSExchangeData;
-
namespace drag_utils {
// Maximum width of the link drag image in pixels.
@@ -30,7 +28,7 @@ static const SkColor kFileDragImageTextColor = SK_ColorBLACK;
void SetURLAndDragImage(const GURL& url,
const string16& title,
const SkBitmap& icon,
- OSExchangeData* data) {
+ ui::OSExchangeData* data) {
DCHECK(url.is_valid() && data);
data->SetURL(url, title);
@@ -57,7 +55,7 @@ void SetURLAndDragImage(const GURL& url,
void CreateDragImageForFile(const FilePath& file_name,
const SkBitmap* icon,
- OSExchangeData* data_object) {
+ ui::OSExchangeData* data_object) {
DCHECK(icon);
DCHECK(data_object);
@@ -95,9 +93,9 @@ void CreateDragImageForFile(const FilePath& file_name,
void SetDragImageOnDataObject(const gfx::Canvas& canvas,
const gfx::Size& size,
const gfx::Point& cursor_offset,
- OSExchangeData* data_object) {
+ ui::OSExchangeData* data_object) {
SetDragImageOnDataObject(
canvas.AsCanvasSkia()->ExtractBitmap(), size, cursor_offset, data_object);
}
-} // namespace drag_utils
+} // namespace drag_utils
diff --git a/views/drag_utils.h b/ui/views/drag_utils.h
index dab3e17..18098c6 100644
--- a/views/drag_utils.h
+++ b/ui/views/drag_utils.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_DRAG_UTILS_H_
-#define VIEWS_DRAG_UTILS_H_
+#ifndef UI_VIEWS_DRAG_UTILS_H_
+#define UI_VIEWS_DRAG_UTILS_H_
#pragma once
#include <string>
@@ -33,7 +33,7 @@ namespace drag_utils {
VIEWS_EXPORT void SetURLAndDragImage(const GURL& url,
const string16& title,
const SkBitmap& icon,
- OSExchangeData* data);
+ ui::OSExchangeData* data);
// Creates a dragging image to be displayed when the user drags a file from
// Chrome (via the download manager, for example). The drag image is set into
@@ -41,7 +41,7 @@ VIEWS_EXPORT void SetURLAndDragImage(const GURL& url,
// portion will be truncated in the drag image.
VIEWS_EXPORT void CreateDragImageForFile(const FilePath& file_name,
const SkBitmap* icon,
- OSExchangeData* data_object);
+ ui::OSExchangeData* data_object);
// Sets the drag image on data_object from the supplied canvas. width/height
// are the size of the image to use, and the offsets give the location of
@@ -49,7 +49,7 @@ VIEWS_EXPORT void CreateDragImageForFile(const FilePath& file_name,
VIEWS_EXPORT void SetDragImageOnDataObject(const gfx::Canvas& canvas,
const gfx::Size& size,
const gfx::Point& cursor_offset,
- OSExchangeData* data_object);
+ ui::OSExchangeData* data_object);
// Sets the drag image on data_object from the supplied bitmap. width/height
// are the size of the image to use, and the offsets give the location of
@@ -57,8 +57,8 @@ VIEWS_EXPORT void SetDragImageOnDataObject(const gfx::Canvas& canvas,
VIEWS_EXPORT void SetDragImageOnDataObject(const SkBitmap& bitmap,
const gfx::Size& size,
const gfx::Point& cursor_offset,
- OSExchangeData* data_object);
+ ui::OSExchangeData* data_object);
-} // namespace drag_utils
+} // namespace drag_utils
-#endif // #ifndef VIEWS_DRAG_UTILS_H_
+#endif // UI_VIEWS_DRAG_UTILS_H_
diff --git a/views/drag_utils_aura.cc b/ui/views/drag_utils_aura.cc
index c14eb9a..f5665fb 100644
--- a/views/drag_utils_aura.cc
+++ b/ui/views/drag_utils_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 "views/drag_utils.h"
+#include "ui/views/drag_utils.h"
#include "base/logging.h"
#include "third_party/skia/include/core/SkBitmap.h"
@@ -12,18 +12,15 @@
#include "ui/gfx/point.h"
#include "ui/gfx/size.h"
-using ui::OSExchangeData;
-using ui::OSExchangeDataProviderAura;
-
namespace drag_utils {
void SetDragImageOnDataObject(const SkBitmap& bitmap,
const gfx::Size& size,
const gfx::Point& cursor_offset,
- OSExchangeData* data_object) {
- OSExchangeDataProviderAura& provider(
- static_cast<OSExchangeDataProviderAura&>(data_object->provider()));
+ ui::OSExchangeData* data_object) {
+ ui::OSExchangeDataProviderAura& provider(
+ static_cast<ui::OSExchangeDataProviderAura&>(data_object->provider()));
provider.set_drag_image(bitmap);
}
-} // namespace drag_utils
+} // namespace drag_utils
diff --git a/views/drag_utils_gtk.cc b/ui/views/drag_utils_gtk.cc
index b0b22c6..45996e7 100644
--- a/views/drag_utils_gtk.cc
+++ b/ui/views/drag_utils_gtk.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "views/drag_utils.h"
+#include "ui/views/drag_utils.h"
#include <gtk/gtk.h>
@@ -15,17 +15,14 @@
#include "ui/gfx/point.h"
#include "ui/gfx/size.h"
-using ui::OSExchangeData;
-using ui::OSExchangeDataProviderGtk;
-
namespace drag_utils {
void SetDragImageOnDataObject(const SkBitmap& bitmap,
const gfx::Size& size,
const gfx::Point& cursor_offset,
- OSExchangeData* data_object) {
- OSExchangeDataProviderGtk& provider(
- static_cast<OSExchangeDataProviderGtk&>(data_object->provider()));
+ ui::OSExchangeData* data_object) {
+ ui::OSExchangeDataProviderGtk& provider(
+ static_cast<ui::OSExchangeDataProviderGtk&>(data_object->provider()));
// Convert the bitmap into a GdkPixbuf.
GdkPixbuf* canvas_pixbuf = gfx::GdkPixbufFromSkBitmap(&bitmap);
@@ -46,4 +43,4 @@ void SetDragImageOnDataObject(const SkBitmap& bitmap,
g_object_unref(pixbuf);
}
-} // namespace drag_utils
+} // namespace drag_utils
diff --git a/views/drag_utils_win.cc b/ui/views/drag_utils_win.cc
index 07905cb..3295f8f 100644
--- a/views/drag_utils_win.cc
+++ b/ui/views/drag_utils_win.cc
@@ -2,23 +2,20 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "views/drag_utils.h"
+#include "ui/views/drag_utils.h"
#include <objidl.h>
#include <shlobj.h>
#include <shobjidl.h>
#include "base/win/scoped_comptr.h"
-#include "ui/base/dragdrop/os_exchange_data.h"
#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/base/dragdrop/os_exchange_data.h"
#include "ui/base/dragdrop/os_exchange_data_provider_win.h"
#include "ui/gfx/canvas_skia.h"
#include "ui/gfx/gdi_util.h"
#include "ui/gfx/skbitmap_operations.h"
-using ui::OSExchangeData;
-using ui::OSExchangeDataProviderWin;
-
namespace drag_utils {
static void SetDragImageOnDataObject(HBITMAP hbitmap,
@@ -59,7 +56,7 @@ static HBITMAP CreateHBITMAPFromSkBitmap(const SkBitmap& sk_bitmap) {
void SetDragImageOnDataObject(const SkBitmap& sk_bitmap,
const gfx::Size& size,
const gfx::Point& cursor_offset,
- OSExchangeData* data_object) {
+ ui::OSExchangeData* data_object) {
DCHECK(data_object && !size.IsEmpty());
// InitializeFromBitmap() doesn't expect an alpha channel and is confused
// by premultiplied colors, so unpremultiply the bitmap.
@@ -69,7 +66,7 @@ void SetDragImageOnDataObject(const SkBitmap& sk_bitmap,
// Attach 'bitmap' to the data_object.
SetDragImageOnDataObject(bitmap, size, cursor_offset,
- OSExchangeDataProviderWin::GetIDataObject(*data_object));
+ ui::OSExchangeDataProviderWin::GetIDataObject(*data_object));
}
-} // namespace drag_utils
+} // namespace drag_utils
diff --git a/views/metrics.cc b/ui/views/metrics.cc
index 525bab0..842ae66 100644
--- a/views/metrics.cc
+++ b/ui/views/metrics.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/metrics.h"
+#include "ui/views/metrics.h"
namespace views {
diff --git a/views/metrics.h b/ui/views/metrics.h
index bcb7cdd..1718ca7 100644
--- a/views/metrics.h
+++ b/ui/views/metrics.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_METRICS_H_
-#define VIEWS_METRICS_H_
+#ifndef UI_VIEWS_METRICS_H_
+#define UI_VIEWS_METRICS_H_
#pragma once
#include "views/views_export.h"
@@ -25,4 +25,4 @@ VIEWS_EXPORT int GetMenuShowDelay();
} // namespace views
-#endif // VIEWS_METRICS_H_
+#endif // UI_VIEWS_METRICS_H_
diff --git a/views/metrics_aura.cc b/ui/views/metrics_aura.cc
index 4eded64..03aa832 100644
--- a/views/metrics_aura.cc
+++ b/ui/views/metrics_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 "views/metrics.h"
+#include "ui/views/metrics.h"
#if defined(OS_WIN)
#include <windows.h>
diff --git a/views/metrics_gtk.cc b/ui/views/metrics_gtk.cc
index 01be70e..b874bae 100644
--- a/views/metrics_gtk.cc
+++ b/ui/views/metrics_gtk.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/metrics.h"
+#include "ui/views/metrics.h"
#include <gtk/gtk.h>
diff --git a/views/metrics_win.cc b/ui/views/metrics_win.cc
index 8150f5a..3e04446 100644
--- a/views/metrics_win.cc
+++ b/ui/views/metrics_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 "views/metrics.h"
+#include "ui/views/metrics.h"
#include <windows.h>
diff --git a/views/mouse_watcher.cc b/ui/views/mouse_watcher.cc
index d074860..555af23 100644
--- a/views/mouse_watcher.cc
+++ b/ui/views/mouse_watcher.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/mouse_watcher.h"
+#include "ui/views/mouse_watcher.h"
#include "base/bind.h"
#include "base/compiler_specific.h"
diff --git a/views/mouse_watcher.h b/ui/views/mouse_watcher.h
index 753f323..cd739d2 100644
--- a/views/mouse_watcher.h
+++ b/ui/views/mouse_watcher.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_MOUSE_WATCHER_H_
-#define VIEWS_MOUSE_WATCHER_H_
+#ifndef UI_VIEWS_MOUSE_WATCHER_H_
+#define UI_VIEWS_MOUSE_WATCHER_H_
#pragma once
#include "base/basictypes.h"
@@ -80,4 +80,4 @@ class VIEWS_EXPORT MouseWatcher {
} // namespace views
-#endif // VIEWS_MOUSE_WATCHER_H_
+#endif // UI_VIEWS_MOUSE_WATCHER_H_
diff --git a/views/view.cc b/views/view.cc
index 3ae325e..6a0db83 100644
--- a/views/view.cc
+++ b/views/view.cc
@@ -23,14 +23,14 @@
#include "ui/gfx/path.h"
#include "ui/gfx/point3.h"
#include "ui/gfx/transform.h"
+#include "ui/views/context_menu_controller.h"
+#include "ui/views/drag_controller.h"
#include "ui/views/layout/layout_manager.h"
#include "ui/views/widget/native_widget_private.h"
#include "ui/views/widget/root_view.h"
#include "ui/views/widget/tooltip_manager.h"
#include "ui/views/widget/widget.h"
#include "views/background.h"
-#include "views/context_menu_controller.h"
-#include "views/drag_controller.h"
#include "views/views_delegate.h"
#if defined(OS_WIN)
diff --git a/views/views.gyp b/views/views.gyp
index bc9fb99..aa50432 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -51,22 +51,6 @@
'background.h',
'border.cc',
'border.h',
- 'context_menu_controller.h',
- #'debug_utils.cc',
- #'debug_utils.h',
- 'drag_controller.h',
- 'drag_utils.cc',
- 'drag_utils.h',
- 'drag_utils_aura.cc',
- 'drag_utils_gtk.cc',
- 'drag_utils_win.cc',
- 'metrics.cc',
- 'metrics.h',
- 'metrics_aura.cc',
- 'metrics_gtk.cc',
- 'metrics_win.cc',
- 'mouse_watcher.cc',
- 'mouse_watcher.h',
'native_theme_delegate.h',
'native_theme_painter.cc',
'native_theme_painter.h',
@@ -98,6 +82,7 @@
'../ui/views/bubble/bubble_delegate.h',
'../ui/views/bubble/bubble_frame_view.cc',
'../ui/views/bubble/bubble_frame_view.h',
+ '../ui/views/context_menu_controller.h',
'../ui/views/controls/button/button.cc',
'../ui/views/controls/button/button.h',
'../ui/views/controls/button/button_dropdown.cc',
@@ -276,6 +261,14 @@
'../ui/views/controls/throbber.h',
'../ui/views/controls/tree/tree_view.cc',
'../ui/views/controls/tree/tree_view.h',
+ #'../ui/views/debug_utils.cc',
+ #'../ui/views/debug_utils.h',
+ '../ui/views/drag_controller.h',
+ '../ui/views/drag_utils.cc',
+ '../ui/views/drag_utils.h',
+ '../ui/views/drag_utils_aura.cc',
+ '../ui/views/drag_utils_gtk.cc',
+ '../ui/views/drag_utils_win.cc',
'../ui/views/events/event.cc',
'../ui/views/events/event.h',
'../ui/views/events/event_aura.cc',
@@ -321,6 +314,13 @@
'../ui/views/layout/layout_constants.h',
'../ui/views/layout/layout_manager.cc',
'../ui/views/layout/layout_manager.h',
+ '../ui/views/metrics.cc',
+ '../ui/views/metrics.h',
+ '../ui/views/metrics_aura.cc',
+ '../ui/views/metrics_gtk.cc',
+ '../ui/views/metrics_win.cc',
+ '../ui/views/mouse_watcher.cc',
+ '../ui/views/mouse_watcher.h',
'../ui/views/touchui/gesture_manager.cc',
'../ui/views/touchui/gesture_manager.h',
'../ui/views/touchui/touch_selection_controller.cc',
@@ -395,7 +395,6 @@
['exclude', '../ui/views/controls/menu/menu_2.*'],
],
'sources!': [
- 'drag_utils_win.cc',
'../ui/views/controls/menu/menu_config_linux.cc',
'../ui/views/controls/menu/menu_item_view_linux.cc',
'../ui/views/controls/menu/menu_separator_linux.cc',
@@ -413,6 +412,7 @@
'../ui/views/controls/table/table_view_observer.h',
'../ui/views/controls/tree/tree_view.cc',
'../ui/views/controls/tree/tree_view.h',
+ '../ui/views/drag_utils_win.cc',
'../ui/views/widget/aero_tooltip_manager.cc',
'../ui/views/widget/aero_tooltip_manager.h',
'../ui/views/widget/child_window_message_processor.cc',