Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(281)

Unified Diff: views/view_unittest.cc

Issue 7534002: Shell of implementation for embedded windows. At this point this is (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Incorporate review feedback Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/all.gyp ('k') | views/widget/widget.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/view_unittest.cc
diff --git a/views/view_unittest.cc b/views/view_unittest.cc
index 0309ada5a0d6d772cb57db78ef170de72afb97f5..4b3fcfe5390f6fa9a56d7e4d2b48df77ccfe856a 100644
--- a/views/view_unittest.cc
+++ b/views/view_unittest.cc
@@ -2398,7 +2398,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);
@@ -2408,7 +2408,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);
}
« no previous file with comments | « build/all.gyp ('k') | views/widget/widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698