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

Side by Side Diff: views/view_unittest.cc

Issue 8136005: Makes visbility inherited. That is, in order for a window to be (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to trunk Created 9 years, 2 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/gfx/compositor/layer_unittest.cc ('k') | views/widget/native_widget_aura.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <map> 5 #include <map>
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "testing/gmock/include/gmock/gmock.h" 10 #include "testing/gmock/include/gmock/gmock.h"
(...skipping 2357 matching lines...) Expand 10 before | Expand all | Expand 10 after
2368 ViewTest::SetUp(); 2368 ViewTest::SetUp();
2369 old_use_acceleration_ = View::get_use_acceleration_when_possible(); 2369 old_use_acceleration_ = View::get_use_acceleration_when_possible();
2370 View::set_use_acceleration_when_possible(true); 2370 View::set_use_acceleration_when_possible(true);
2371 2371
2372 ui::TestTexture::reset_live_count(); 2372 ui::TestTexture::reset_live_count();
2373 2373
2374 widget_ = new Widget; 2374 widget_ = new Widget;
2375 Widget::InitParams params(Widget::InitParams::TYPE_POPUP); 2375 Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
2376 params.bounds = gfx::Rect(50, 50, 200, 200); 2376 params.bounds = gfx::Rect(50, 50, 200, 200);
2377 widget_->Init(params); 2377 widget_->Init(params);
2378 widget_->Show();
2378 widget_->GetRootView()->SetBounds(0, 0, 200, 200); 2379 widget_->GetRootView()->SetBounds(0, 0, 200, 200);
2379 } 2380 }
2380 2381
2381 virtual void TearDown() OVERRIDE { 2382 virtual void TearDown() OVERRIDE {
2382 View::set_use_acceleration_when_possible(old_use_acceleration_); 2383 View::set_use_acceleration_when_possible(old_use_acceleration_);
2383 widget_->CloseNow(); 2384 widget_->CloseNow();
2384 Widget::SetPureViews(false); 2385 Widget::SetPureViews(false);
2385 ViewsTestBase::TearDown(); 2386 ViewsTestBase::TearDown();
2386 } 2387 }
2387 2388
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
2799 // Make content_view have a dirty rect, paint the layers and make sure 2800 // Make content_view have a dirty rect, paint the layers and make sure
2800 // PaintTrackingView is painted. 2801 // PaintTrackingView is painted.
2801 content_view->layer()->SchedulePaint(gfx::Rect(0, 0, 10, 10)); 2802 content_view->layer()->SchedulePaint(gfx::Rect(0, 0, 10, 10));
2802 GetRootLayer()->DrawTree(); 2803 GetRootLayer()->DrawTree();
2803 EXPECT_TRUE(content_view->painted()); 2804 EXPECT_TRUE(content_view->painted());
2804 } 2805 }
2805 2806
2806 #endif // VIEWS_COMPOSITOR 2807 #endif // VIEWS_COMPOSITOR
2807 2808
2808 } // namespace views 2809 } // namespace views
OLDNEW
« no previous file with comments | « ui/gfx/compositor/layer_unittest.cc ('k') | views/widget/native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698