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

Unified Diff: ui/views_content_client/views_content_client_main_parts_chromeos.cc

Issue 345603003: aura: Allow specifying the size of TestScreen when creating it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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
« content/shell/browser/shell_views.cc ('K') | « ui/aura/test/test_screen.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views_content_client/views_content_client_main_parts_chromeos.cc
diff --git a/ui/views_content_client/views_content_client_main_parts_chromeos.cc b/ui/views_content_client/views_content_client_main_parts_chromeos.cc
index 265ba095940138f517c2fe615cea6c3e596eca22..b1ba000db33cfdd84efdfec6b8f94f5e524580e4 100644
--- a/ui/views_content_client/views_content_client_main_parts_chromeos.cc
+++ b/ui/views_content_client/views_content_client_main_parts_chromeos.cc
@@ -62,11 +62,12 @@ ViewsContentClientMainPartsChromeOS::ViewsContentClientMainPartsChromeOS(
void ViewsContentClientMainPartsChromeOS::PreMainMessageLoopRun() {
ViewsContentClientMainPartsAura::PreMainMessageLoopRun();
- gfx::Screen::SetScreenInstance(
- gfx::SCREEN_TYPE_NATIVE, aura::TestScreen::Create());
+ gfx::Size host_size(800, 600);
+ gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE,
+ aura::TestScreen::Create(host_size));
sky 2014/06/19 14:51:08 Same question here about leaking.
// Set up basic pieces of views::corewm.
- wm_test_helper_.reset(new ::wm::WMTestHelper(gfx::Size(800, 600),
- content::GetContextFactory()));
+ wm_test_helper_.reset(
+ new ::wm::WMTestHelper(host_size, content::GetContextFactory()));
// Ensure the X window gets mapped.
wm_test_helper_->host()->Show();
« content/shell/browser/shell_views.cc ('K') | « ui/aura/test/test_screen.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698