diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-01 17:09:46 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-01 17:09:46 +0000 |
| commit | e865b36b87c44b419886035f898ae1c13a54f91b (patch) | |
| tree | 5cc1916d036b64af8af573ac1ac769a7bc169211 /views/test | |
| parent | 0d1046002cb8aa1a2756f604b05bafb60c594f9f (diff) | |
| download | chromium_src-e865b36b87c44b419886035f898ae1c13a54f91b.zip chromium_src-e865b36b87c44b419886035f898ae1c13a54f91b.tar.gz chromium_src-e865b36b87c44b419886035f898ae1c13a54f91b.tar.bz2 | |
Gets compositor working for embedded widgets.
BUG=none
TEST=none
R=ben@chromium.org
Review URL: http://codereview.chromium.org/7280002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/test')
| -rw-r--r-- | views/test/test_views_delegate.cc | 6 | ||||
| -rw-r--r-- | views/test/test_views_delegate.h | 5 | ||||
| -rw-r--r-- | views/test/views_test_base.h | 3 |
3 files changed, 12 insertions, 2 deletions
diff --git a/views/test/test_views_delegate.cc b/views/test/test_views_delegate.cc index 2480d0b..62b81ed5 100644 --- a/views/test/test_views_delegate.cc +++ b/views/test/test_views_delegate.cc @@ -6,10 +6,12 @@ #include "base/logging.h" -TestViewsDelegate::TestViewsDelegate() { +TestViewsDelegate::TestViewsDelegate() + : default_parent_view_(NULL) { DCHECK(!views::ViewsDelegate::views_delegate); views::ViewsDelegate::views_delegate = this; } + TestViewsDelegate::~TestViewsDelegate() { views::ViewsDelegate::views_delegate = NULL; } @@ -23,7 +25,7 @@ ui::Clipboard* TestViewsDelegate::GetClipboard() const { } views::View* TestViewsDelegate::GetDefaultParentView() { - return NULL; + return default_parent_view_; } bool TestViewsDelegate::GetSavedWindowBounds(const views::Widget* window, diff --git a/views/test/test_views_delegate.h b/views/test/test_views_delegate.h index a315a09..3fd4149 100644 --- a/views/test/test_views_delegate.h +++ b/views/test/test_views_delegate.h @@ -21,6 +21,10 @@ class TestViewsDelegate : public views::ViewsDelegate { TestViewsDelegate(); virtual ~TestViewsDelegate(); + void set_default_parent_view(views::View* view) { + default_parent_view_ = view; + } + // Overridden from views::ViewsDelegate: virtual ui::Clipboard* GetClipboard() const OVERRIDE; virtual views::View* GetDefaultParentView() OVERRIDE; @@ -57,6 +61,7 @@ class TestViewsDelegate : public views::ViewsDelegate { virtual int GetDispositionForEvent(int event_flags) OVERRIDE; private: + views::View* default_parent_view_; mutable scoped_ptr<ui::Clipboard> clipboard_; DISALLOW_COPY_AND_ASSIGN(TestViewsDelegate); diff --git a/views/test/views_test_base.h b/views/test/views_test_base.h index 9fa4542..4eb111a 100644 --- a/views/test/views_test_base.h +++ b/views/test/views_test_base.h @@ -27,6 +27,9 @@ class ViewsTestBase : public testing::Test { message_loop_.RunAllPending(); } + protected: + TestViewsDelegate& views_delegate() { return views_delegate_; } + private: MessageLoopForUI message_loop_; TestViewsDelegate views_delegate_; |