summaryrefslogtreecommitdiffstats
path: root/ui/views/controls/scrollbar
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-01 16:09:33 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-01 16:09:33 +0000
commit45647af87d1e7e5ed607c6fd82a1ac32a708a725 (patch)
tree258381d5b333c5749616d97c1fe3a6bc4db50e1d /ui/views/controls/scrollbar
parentab91de22a8a7eef73958b0b4463de89bd7fdbd12 (diff)
downloadchromium_src-45647af87d1e7e5ed607c6fd82a1ac32a708a725.zip
chromium_src-45647af87d1e7e5ed607c6fd82a1ac32a708a725.tar.gz
chromium_src-45647af87d1e7e5ed607c6fd82a1ac32a708a725.tar.bz2
views: Move the remaining file from views/ to ui/views/.
BUG=104039 R=ben@chromium.org TBR=stevenjb@chromium.org Review URL: http://codereview.chromium.org/8771006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112469 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/controls/scrollbar')
-rw-r--r--ui/views/controls/scrollbar/base_scroll_bar.h2
-rw-r--r--ui/views/controls/scrollbar/base_scroll_bar_button.h2
-rw-r--r--ui/views/controls/scrollbar/bitmap_scroll_bar.cc2
-rw-r--r--ui/views/controls/scrollbar/native_scroll_bar_wrapper.h2
-rw-r--r--ui/views/controls/scrollbar/scroll_bar.h2
5 files changed, 5 insertions, 5 deletions
diff --git a/ui/views/controls/scrollbar/base_scroll_bar.h b/ui/views/controls/scrollbar/base_scroll_bar.h
index 09d581e..46515d5 100644
--- a/ui/views/controls/scrollbar/base_scroll_bar.h
+++ b/ui/views/controls/scrollbar/base_scroll_bar.h
@@ -10,7 +10,7 @@
#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/repeat_controller.h"
+#include "ui/views/repeat_controller.h"
namespace views {
diff --git a/ui/views/controls/scrollbar/base_scroll_bar_button.h b/ui/views/controls/scrollbar/base_scroll_bar_button.h
index 21bea4d..ead66e3 100644
--- a/ui/views/controls/scrollbar/base_scroll_bar_button.h
+++ b/ui/views/controls/scrollbar/base_scroll_bar_button.h
@@ -8,7 +8,7 @@
#include "ui/views/controls/button/custom_button.h"
-#include "views/repeat_controller.h"
+#include "ui/views/repeat_controller.h"
#if defined(OS_LINUX)
#include "ui/gfx/screen.h"
diff --git a/ui/views/controls/scrollbar/bitmap_scroll_bar.cc b/ui/views/controls/scrollbar/bitmap_scroll_bar.cc
index 47c8f13..a8d0658 100644
--- a/ui/views/controls/scrollbar/bitmap_scroll_bar.cc
+++ b/ui/views/controls/scrollbar/bitmap_scroll_bar.cc
@@ -23,7 +23,7 @@
#include "ui/views/widget/widget.h"
#if defined(OS_LINUX)
-#include "views/screen.h"
+#include "ui/views/screen.h"
#endif
#undef min
diff --git a/ui/views/controls/scrollbar/native_scroll_bar_wrapper.h b/ui/views/controls/scrollbar/native_scroll_bar_wrapper.h
index dc8cc07..7c94a0a 100644
--- a/ui/views/controls/scrollbar/native_scroll_bar_wrapper.h
+++ b/ui/views/controls/scrollbar/native_scroll_bar_wrapper.h
@@ -6,7 +6,7 @@
#define UI_VIEWS_CONTROLS_SCROLLBAR_NATIVE_SCROLL_BAR_WRAPPER_H_
#pragma once
-#include "views/views_export.h"
+#include "ui/views/views_export.h"
namespace views {
diff --git a/ui/views/controls/scrollbar/scroll_bar.h b/ui/views/controls/scrollbar/scroll_bar.h
index 39263d6..1ed3d5c 100644
--- a/ui/views/controls/scrollbar/scroll_bar.h
+++ b/ui/views/controls/scrollbar/scroll_bar.h
@@ -9,7 +9,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "ui/views/view.h"
-#include "views/views_export.h"
+#include "ui/views/views_export.h"
namespace views {