diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-15 00:31:33 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-15 00:31:33 +0000 |
| commit | af4f171c3d1fb1b8e0c4fe3f09d06ea45d7bf71d (patch) | |
| tree | 0d222ccfb866ed77ebab007d07f713892ece1686 /views/test | |
| parent | 31d5649978518533ee904064a980668cdc05d8a6 (diff) | |
| download | chromium_src-af4f171c3d1fb1b8e0c4fe3f09d06ea45d7bf71d.zip chromium_src-af4f171c3d1fb1b8e0c4fe3f09d06ea45d7bf71d.tar.gz chromium_src-af4f171c3d1fb1b8e0c4fe3f09d06ea45d7bf71d.tar.bz2 | |
views: Add views namespace to TestViewsDelegate.
Note: This was a TODO for ben.
BUG=None
TEST=views_unittests, views_examples, views_desktop.
R=ben@chromium.org
Review URL: http://codereview.chromium.org/7359006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92629 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/test')
| -rw-r--r-- | views/test/test_views_delegate.cc | 13 | ||||
| -rw-r--r-- | views/test/test_views_delegate.h | 26 |
2 files changed, 25 insertions, 14 deletions
diff --git a/views/test/test_views_delegate.cc b/views/test/test_views_delegate.cc index 26790d3..d25e729 100644 --- a/views/test/test_views_delegate.cc +++ b/views/test/test_views_delegate.cc @@ -5,15 +5,18 @@ #include "views/test/test_views_delegate.h" #include "base/logging.h" +#include "ui/base/clipboard/clipboard.h" + +namespace views { TestViewsDelegate::TestViewsDelegate() : default_parent_view_(NULL) { - DCHECK(!views::ViewsDelegate::views_delegate); - views::ViewsDelegate::views_delegate = this; + DCHECK(!ViewsDelegate::views_delegate); + ViewsDelegate::views_delegate = this; } TestViewsDelegate::~TestViewsDelegate() { - views::ViewsDelegate::views_delegate = NULL; + ViewsDelegate::views_delegate = NULL; } ui::Clipboard* TestViewsDelegate::GetClipboard() const { @@ -24,7 +27,7 @@ ui::Clipboard* TestViewsDelegate::GetClipboard() const { return clipboard_.get(); } -views::View* TestViewsDelegate::GetDefaultParentView() { +View* TestViewsDelegate::GetDefaultParentView() { return default_parent_view_; } @@ -41,3 +44,5 @@ bool TestViewsDelegate::GetSavedMaximizedState(const std::wstring& window_name, int TestViewsDelegate::GetDispositionForEvent(int event_flags) { return 0; } + +} // namespace views diff --git a/views/test/test_views_delegate.h b/views/test/test_views_delegate.h index 7f0aa88..82618ff 100644 --- a/views/test/test_views_delegate.h +++ b/views/test/test_views_delegate.h @@ -5,30 +5,34 @@ #ifndef VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ #define VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ +#include "base/basictypes.h" +#include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "ui/base/accessibility/accessibility_types.h" -#include "ui/base/clipboard/clipboard.h" #include "views/views_delegate.h" -// TODO(beng): this whole file should be in the views namespace. +namespace ui { +class Clipboard; +} + namespace views { class View; class Widget; -} -class TestViewsDelegate : public views::ViewsDelegate { +class TestViewsDelegate : public ViewsDelegate { public: TestViewsDelegate(); virtual ~TestViewsDelegate(); - void set_default_parent_view(views::View* view) { + void set_default_parent_view(View* view) { default_parent_view_ = view; } - // Overridden from views::ViewsDelegate: + // Overridden from ViewsDelegate: virtual ui::Clipboard* GetClipboard() const OVERRIDE; - virtual views::View* GetDefaultParentView() OVERRIDE; - virtual void SaveWindowPlacement(const views::Widget* window, + virtual View* GetDefaultParentView() OVERRIDE; + virtual void SaveWindowPlacement(const Widget* window, const std::wstring& window_name, const gfx::Rect& bounds, bool maximized) OVERRIDE {} @@ -39,7 +43,7 @@ class TestViewsDelegate : public views::ViewsDelegate { bool* maximized) const OVERRIDE; virtual void NotifyAccessibilityEvent( - views::View* view, ui::AccessibilityTypes::Event event_type) OVERRIDE {} + View* view, ui::AccessibilityTypes::Event event_type) OVERRIDE {} virtual void NotifyMenuItemFocused( const std::wstring& menu_name, @@ -59,10 +63,12 @@ class TestViewsDelegate : public views::ViewsDelegate { virtual int GetDispositionForEvent(int event_flags) OVERRIDE; private: - views::View* default_parent_view_; + View* default_parent_view_; mutable scoped_ptr<ui::Clipboard> clipboard_; DISALLOW_COPY_AND_ASSIGN(TestViewsDelegate); }; +} // namespace views + #endif // VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ |