diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-16 23:51:38 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-16 23:51:38 +0000 |
| commit | c2dacc9ec41232903ba700c6aef5ef98bfcb8af8 (patch) | |
| tree | 4aa4d7100862c64bdd92d70e6323001beb19edb7 /chrome/test/interactive_ui | |
| parent | d66e710ec668e34271def44d7f0416260657171c (diff) | |
| download | chromium_src-c2dacc9ec41232903ba700c6aef5ef98bfcb8af8.zip chromium_src-c2dacc9ec41232903ba700c6aef5ef98bfcb8af8.tar.gz chromium_src-c2dacc9ec41232903ba700c6aef5ef98bfcb8af8.tar.bz2 | |
Rename ChromeViews namespace to views
http://crbug.com/2188
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3495 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/interactive_ui')
| -rw-r--r-- | chrome/test/interactive_ui/view_event_test_base.cc | 8 | ||||
| -rw-r--r-- | chrome/test/interactive_ui/view_event_test_base.h | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/chrome/test/interactive_ui/view_event_test_base.cc b/chrome/test/interactive_ui/view_event_test_base.cc index 9f36318..bbd312a 100644 --- a/chrome/test/interactive_ui/view_event_test_base.cc +++ b/chrome/test/interactive_ui/view_event_test_base.cc @@ -12,7 +12,7 @@ namespace { // View subclass that allows you to specify the preferred size. -class TestView : public ChromeViews::View { +class TestView : public views::View { public: TestView() {} @@ -47,7 +47,7 @@ ViewEventTestBase::ViewEventTestBase() : window_(NULL), content_view_(NULL) { } void ViewEventTestBase::SetUp() { OleInitialize(NULL); - window_ = ChromeViews::Window::CreateChromeWindow(NULL, gfx::Rect(), this); + window_ = views::Window::CreateChromeWindow(NULL, gfx::Rect(), this); } void ViewEventTestBase::TearDown() { @@ -58,12 +58,12 @@ void ViewEventTestBase::TearDown() { OleUninitialize(); } -ChromeViews::View* ViewEventTestBase::GetContentsView() { +views::View* ViewEventTestBase::GetContentsView() { if (!content_view_) { // Wrap the real view (as returned by CreateContentsView) in a View so // that we can customize the preferred size. TestView* test_view = new TestView(); - test_view->SetLayoutManager(new ChromeViews::FillLayout()); + test_view->SetLayoutManager(new views::FillLayout()); test_view->set_preferred_size(GetPreferredSize()); test_view->AddChildView(CreateContentsView()); content_view_ = test_view; diff --git a/chrome/test/interactive_ui/view_event_test_base.h b/chrome/test/interactive_ui/view_event_test_base.h index 28b5a5e..42a614b 100644 --- a/chrome/test/interactive_ui/view_event_test_base.h +++ b/chrome/test/interactive_ui/view_event_test_base.h @@ -53,7 +53,7 @@ class Size; // // Then use this to schedule another mouse move. // ScheduleMouseMoveInBackground(loc.x, loc.y); -class ViewEventTestBase : public ChromeViews::WindowDelegate, +class ViewEventTestBase : public views::WindowDelegate, public testing::Test { public: // Invoke when done either because of failure or success. Quits the message @@ -74,7 +74,7 @@ class ViewEventTestBase : public ChromeViews::WindowDelegate, // WindowDelegate method. Calls into CreateContentsView to get the actual // view. - virtual ChromeViews::View* GetContentsView(); + virtual views::View* GetContentsView(); // Overriden to do nothing so that this class can be used in runnable tasks. void AddRef() {} @@ -82,7 +82,7 @@ class ViewEventTestBase : public ChromeViews::WindowDelegate, protected: // Returns the view that is added to the window. - virtual ChromeViews::View* CreateContentsView() = 0; + virtual views::View* CreateContentsView() = 0; // Called once the message loop is running. virtual void DoTestOnMessageLoop() = 0; @@ -108,7 +108,7 @@ class ViewEventTestBase : public ChromeViews::WindowDelegate, // Spawns a new thread posts a MouseMove in the background. void ScheduleMouseMoveInBackground(int x, int y); - ChromeViews::Window* window_; + views::Window* window_; private: // Stops the thread started by ScheduleMouseMoveInBackground. @@ -119,7 +119,7 @@ class ViewEventTestBase : public ChromeViews::WindowDelegate, void RunTestMethod(Task* task); // The content of the Window. - ChromeViews::View* content_view_; + views::View* content_view_; // Thread for posting background MouseMoves. scoped_ptr<base::Thread> dnd_thread_; |