summaryrefslogtreecommitdiffstats
path: root/chrome/views/controls
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-06 02:23:31 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-06 02:23:31 +0000
commit3712621396b5ffa5572bc5c0728a63efe9f7476e (patch)
treea55fc85f01bafbe1ae86e43c5f1ce9638db5b621 /chrome/views/controls
parentaf9a8c86fc50e8d789bf795347302e6c94ad6854 (diff)
downloadchromium_src-3712621396b5ffa5572bc5c0728a63efe9f7476e.zip
chromium_src-3712621396b5ffa5572bc5c0728a63efe9f7476e.tar.gz
chromium_src-3712621396b5ffa5572bc5c0728a63efe9f7476e.tar.bz2
Move: drag_drop_types, favicon_size, icon_util, insets, path, message_box_flags, os_exchange_data to src/app
http://crbug.com/11387 Review URL: http://codereview.chromium.org/115012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15371 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/views/controls')
-rw-r--r--chrome/views/controls/button/menu_button.cc2
-rw-r--r--chrome/views/controls/label.cc2
-rw-r--r--chrome/views/controls/menu/chrome_menu.cc2
-rw-r--r--chrome/views/controls/menu/chrome_menu.h2
-rw-r--r--chrome/views/controls/message_box_view.cc2
-rw-r--r--chrome/views/controls/table/table_view.cc4
-rw-r--r--chrome/views/controls/text_field.cc3
-rw-r--r--chrome/views/controls/throbber.cc1
-rw-r--r--chrome/views/controls/tree/tree_view.cc2
9 files changed, 9 insertions, 11 deletions
diff --git a/chrome/views/controls/button/menu_button.cc b/chrome/views/controls/button/menu_button.cc
index f7e7136..6f82b16 100644
--- a/chrome/views/controls/button/menu_button.cc
+++ b/chrome/views/controls/button/menu_button.cc
@@ -4,10 +4,10 @@
#include "chrome/views/controls/button/menu_button.h"
+#include "app/drag_drop_types.h"
#include "app/gfx/chrome_canvas.h"
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
-#include "chrome/common/drag_drop_types.h"
#include "chrome/common/win_util.h"
#include "chrome/views/controls/button/button.h"
#include "chrome/views/controls/menu/view_menu_delegate.h"
diff --git a/chrome/views/controls/label.cc b/chrome/views/controls/label.cc
index 7cd8920..be9918f 100644
--- a/chrome/views/controls/label.cc
+++ b/chrome/views/controls/label.cc
@@ -8,11 +8,11 @@
#include "app/gfx/chrome_canvas.h"
#include "app/gfx/chrome_font.h"
+#include "app/gfx/insets.h"
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
#include "base/logging.h"
#include "base/string_util.h"
-#include "chrome/common/gfx/insets.h"
#include "chrome/common/gfx/text_elider.h"
#include "chrome/views/background.h"
diff --git a/chrome/views/controls/menu/chrome_menu.cc b/chrome/views/controls/menu/chrome_menu.cc
index c591a7e..1b1e475 100644
--- a/chrome/views/controls/menu/chrome_menu.cc
+++ b/chrome/views/controls/menu/chrome_menu.cc
@@ -11,6 +11,7 @@
#include "app/gfx/chrome_canvas.h"
#include "app/l10n_util.h"
#include "app/l10n_util_win.h"
+#include "app/os_exchange_data.h"
#include "base/base_drag_source.h"
#include "base/gfx/native_theme.h"
#include "base/message_loop.h"
@@ -20,7 +21,6 @@
// TODO(beng): (Cleanup) remove this browser dep.
#include "chrome/browser/drag_utils.h"
#include "chrome/common/gfx/color_utils.h"
-#include "chrome/common/os_exchange_data.h"
#include "chrome/views/border.h"
#include "chrome/views/view_constants.h"
#include "chrome/views/widget/root_view.h"
diff --git a/chrome/views/controls/menu/chrome_menu.h b/chrome/views/controls/menu/chrome_menu.h
index 5258742..6f18abb 100644
--- a/chrome/views/controls/menu/chrome_menu.h
+++ b/chrome/views/controls/menu/chrome_menu.h
@@ -8,12 +8,12 @@
#include <list>
#include <vector>
+#include "app/drag_drop_types.h"
#include "app/gfx/chrome_font.h"
#include "base/gfx/point.h"
#include "base/gfx/rect.h"
#include "base/message_loop.h"
#include "base/task.h"
-#include "chrome/common/drag_drop_types.h"
#include "chrome/views/controls/menu/controller.h"
#include "chrome/views/view.h"
#include "skia/include/SkBitmap.h"
diff --git a/chrome/views/controls/message_box_view.cc b/chrome/views/controls/message_box_view.cc
index 191b78c..6fb895a 100644
--- a/chrome/views/controls/message_box_view.cc
+++ b/chrome/views/controls/message_box_view.cc
@@ -5,13 +5,13 @@
#include "chrome/views/controls/message_box_view.h"
#include "app/l10n_util.h"
+#include "app/message_box_flags.h"
#include "base/clipboard.h"
#include "base/message_loop.h"
#include "base/scoped_clipboard_writer.h"
#include "base/string_util.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/views/standard_layout.h"
-#include "chrome/common/message_box_flags.h"
#include "chrome/views/controls/button/checkbox.h"
#include "chrome/views/window/client_view.h"
#include "grit/generated_resources.h"
diff --git a/chrome/views/controls/table/table_view.cc b/chrome/views/controls/table/table_view.cc
index ecb9773..445c262 100644
--- a/chrome/views/controls/table/table_view.cc
+++ b/chrome/views/controls/table/table_view.cc
@@ -8,12 +8,12 @@
#include <windowsx.h>
#include "app/gfx/chrome_canvas.h"
+#include "app/gfx/favicon_size.h"
+#include "app/gfx/icon_util.h"
#include "app/l10n_util_win.h"
#include "app/resource_bundle.h"
#include "base/string_util.h"
#include "base/win_util.h"
-#include "chrome/common/gfx/favicon_size.h"
-#include "chrome/common/gfx/icon_util.h"
#include "chrome/common/win_util.h"
#include "chrome/views/controls/hwnd_view.h"
#include "SkBitmap.h"
diff --git a/chrome/views/controls/text_field.cc b/chrome/views/controls/text_field.cc
index 4e61afd..0871cdf 100644
--- a/chrome/views/controls/text_field.cc
+++ b/chrome/views/controls/text_field.cc
@@ -11,6 +11,7 @@
#include <tom.h> // For ITextDocument, a COM interface to CRichEditCtrl
#include <vsstyle.h>
+#include "app/gfx/insets.h"
#include "app/l10n_util.h"
#include "app/l10n_util_win.h"
#include "base/clipboard.h"
@@ -19,8 +20,6 @@
#include "base/string_util.h"
#include "base/win_util.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/common/gfx/insets.h"
-#include "chrome/common/logging_chrome.h"
#include "chrome/common/win_util.h"
#include "chrome/views/controls/hwnd_view.h"
#include "chrome/views/controls/menu/menu.h"
diff --git a/chrome/views/controls/throbber.cc b/chrome/views/controls/throbber.cc
index de2a651..64d18e5 100644
--- a/chrome/views/controls/throbber.cc
+++ b/chrome/views/controls/throbber.cc
@@ -7,7 +7,6 @@
#include "app/gfx/chrome_canvas.h"
#include "app/resource_bundle.h"
#include "base/time.h"
-#include "chrome/common/logging_chrome.h"
#include "grit/theme_resources.h"
#include "skia/include/SkBitmap.h"
diff --git a/chrome/views/controls/tree/tree_view.cc b/chrome/views/controls/tree/tree_view.cc
index e657658..1bf668c 100644
--- a/chrome/views/controls/tree/tree_view.cc
+++ b/chrome/views/controls/tree/tree_view.cc
@@ -7,12 +7,12 @@
#include <shellapi.h>
#include "app/gfx/chrome_canvas.h"
+#include "app/gfx/icon_util.h"
#include "app/l10n_util.h"
#include "app/l10n_util_win.h"
#include "app/resource_bundle.h"
#include "base/stl_util-inl.h"
#include "base/win_util.h"
-#include "chrome/common/gfx/icon_util.h"
#include "chrome/views/focus/focus_manager.h"
#include "chrome/views/widget/widget.h"
#include "grit/theme_resources.h"