diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-29 19:32:06 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-29 19:32:06 +0000 |
| commit | 81585f3fa532dbe0355991b56c8d5bbb7b9ae321 (patch) | |
| tree | 69f78267fc35600fec11a9533fe5d7af18ed42dc /views | |
| parent | f1aa3566cb4b397eb4f567e8b88610d81de17566 (diff) | |
| download | chromium_src-81585f3fa532dbe0355991b56c8d5bbb7b9ae321.zip chromium_src-81585f3fa532dbe0355991b56c8d5bbb7b9ae321.tar.gz chromium_src-81585f3fa532dbe0355991b56c8d5bbb7b9ae321.tar.bz2 | |
Shell of implementation for embedded windows. At this point this is
just a proof of concept. Next step is going to be pulling code from
the window manager into this. Desktop will likely be renamed to
WindowManager.
At this point just make sure you think I'm not going off into the
weeds.
BUG=none
TEST=none
R=derat@chromium.org
Review URL: http://codereview.chromium.org/7534002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94733 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/view_unittest.cc | 4 | ||||
| -rw-r--r-- | views/widget/widget.h | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/views/view_unittest.cc b/views/view_unittest.cc index 915104f1..e4ed9e5 100644 --- a/views/view_unittest.cc +++ b/views/view_unittest.cc @@ -2402,7 +2402,7 @@ class ViewLayerTest : public ViewsTestBase { TestTexture::reset_live_count(); - Widget::set_compositor_factory(&TestCreateCompositor); + Widget::set_compositor_factory_for_testing(&TestCreateCompositor); widget_ = new Widget; Widget::InitParams params(Widget::InitParams::TYPE_POPUP); params.bounds = gfx::Rect(50, 50, 200, 200); @@ -2412,7 +2412,7 @@ class ViewLayerTest : public ViewsTestBase { virtual void TearDown() OVERRIDE { View::set_use_acceleration_when_possible(old_use_acceleration_); widget_->CloseNow(); - Widget::set_compositor_factory(NULL); + Widget::set_compositor_factory_for_testing(NULL); Widget::SetPureViews(false); } diff --git a/views/widget/widget.h b/views/widget/widget.h index 372b5a8..9af6481 100644 --- a/views/widget/widget.h +++ b/views/widget/widget.h @@ -486,11 +486,9 @@ class VIEWS_API Widget : public internal::NativeWidgetDelegate, return non_client_view_ ? non_client_view_->client_view() : NULL; } -#if defined(UNIT_TEST) - static void set_compositor_factory(ui::Compositor*(*factory)()) { + static void set_compositor_factory_for_testing(ui::Compositor*(*factory)()) { compositor_factory_ = factory; } -#endif static ui::Compositor* (*compositor_factory())() { return compositor_factory_; } |