summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-25 20:20:35 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-25 20:20:35 +0000
commit72bcfc775d748a460876d7ff04cfacad07b4496b (patch)
tree10d6469a991fa16d3e720ad3cf82b8d65e2dccd4 /chrome/browser/ui
parent6ea7e2a32b0831bd75ac01ae60731ade971bc6e3 (diff)
downloadchromium_src-72bcfc775d748a460876d7ff04cfacad07b4496b.zip
chromium_src-72bcfc775d748a460876d7ff04cfacad07b4496b.tar.gz
chromium_src-72bcfc775d748a460876d7ff04cfacad07b4496b.tar.bz2
views: Move tabbed_pane directory to ui/views/controls/.
BUG=104039 R=maruel@chromium.org TBR=ben@chromium.org Review URL: http://codereview.chromium.org/8658009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111612 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui')
-rw-r--r--chrome/browser/ui/views/collected_cookies_win.cc2
-rw-r--r--chrome/browser/ui/views/collected_cookies_win.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/views/collected_cookies_win.cc b/chrome/browser/ui/views/collected_cookies_win.cc
index f22ef16..603dc01 100644
--- a/chrome/browser/ui/views/collected_cookies_win.cc
+++ b/chrome/browser/ui/views/collected_cookies_win.cc
@@ -25,6 +25,7 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/color_utils.h"
+#include "ui/views/controls/tabbed_pane/tabbed_pane.h"
#include "ui/views/layout/box_layout.h"
#include "ui/views/layout/grid_layout.h"
#include "ui/views/layout/layout_constants.h"
@@ -32,7 +33,6 @@
#include "views/controls/button/text_button.h"
#include "views/controls/image_view.h"
#include "views/controls/label.h"
-#include "views/controls/tabbed_pane/tabbed_pane.h"
namespace browser {
diff --git a/chrome/browser/ui/views/collected_cookies_win.h b/chrome/browser/ui/views/collected_cookies_win.h
index 519122a..9e1ef79 100644
--- a/chrome/browser/ui/views/collected_cookies_win.h
+++ b/chrome/browser/ui/views/collected_cookies_win.h
@@ -10,9 +10,9 @@
#include "chrome/common/content_settings.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
+#include "ui/views/controls/tabbed_pane/tabbed_pane_listener.h"
#include "ui/views/controls/tree/tree_view.h"
#include "ui/views/window/dialog_delegate.h"
-#include "views/controls/tabbed_pane/tabbed_pane_listener.h"
class ConstrainedWindow;
class CookieInfoView;