aura: Allow specifying the size of TestScreen when creating it.

BUG=380215
R=jamescook@chromium.org, sky@chromium.org
TBR=pfeldman@ for content/shell changes

Review URL: https://codereview.chromium.org/345603003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278697 0039d316-1c4b-4281-b951-d872f2087c98

apps/shell/browser/shell_desktop_controller.cc

@@ -224,16 +224,16 @@ void ShellDesktopController::OnHostCloseRequested(
 }
 
 void ShellDesktopController::CreateRootWindow() {
-  test_screen_.reset(aura::TestScreen::Create());
-  // TODO(jamescook): Replace this with a real Screen implementation.
-  gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_.get());
-  // TODO(mukai): Set up input method.
-
   // Set up basic pieces of ui::wm.
   gfx::Size size = GetPrimaryDisplaySize();
   if (size.IsEmpty())
     size = gfx::Size(1280, 720);
 
+  test_screen_.reset(aura::TestScreen::Create(size));
+  // TODO(jamescook): Replace this with a real Screen implementation.
+  gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_.get());
+  // TODO(mukai): Set up input method.
+
   host_.reset(aura::WindowTreeHost::Create(gfx::Rect(size)));
   host_->InitHost();
   aura::client::SetWindowTreeClient(host_->window(), this);

athena/test/athena_test_helper.cc

@@ -56,7 +56,8 @@ void AthenaTestHelper::SetUp(ui::ContextFactory* context_factory) {
 
   ui::InitializeInputMethodForTesting();
 
-  test_screen_.reset(aura::TestScreen::Create());
+  const gfx::Size host_size(800, 600);
+  test_screen_.reset(aura::TestScreen::Create(host_size));
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_.get());
   host_.reset(test_screen_->CreateHostForPrimaryDisplay());
 
@@ -73,7 +74,7 @@ void AthenaTestHelper::SetUp(ui::ContextFactory* context_factory) {
 
   root_window()->Show();
   // Ensure width != height so tests won't confuse them.
-  host()->SetBounds(gfx::Rect(800, 600));
+  host()->SetBounds(gfx::Rect(host_size));
 
   athena::StartAthena(root_window(),
                       new SampleActivityFactory(),

chrome/browser/signin/signin_error_notifier_ash_unittest.cc

@@ -79,7 +79,7 @@ class SigninErrorNotifierTest : public AshTestBase {
 
     // Set up screen for Windows.
 #if defined(OS_WIN)
-    aura::TestScreen* test_screen = aura::TestScreen::Create();
+    aura::TestScreen* test_screen = aura::TestScreen::Create(gfx::Size());
     gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen);
     gfx::Screen::SetScreenTypeDelegate(new ScreenTypeDelegateDesktop);
 #endif

chrome/browser/sync/sync_error_notifier_ash_unittest.cc

@@ -109,7 +109,7 @@ class SyncErrorNotifierTest : public AshTestBase  {
     // Set up a desktop screen for Windows to hold native widgets, used when
     // adding desktop widgets (i.e., message center notifications).
 #if defined(OS_WIN)
-    aura::TestScreen* test_screen = aura::TestScreen::Create();
+    aura::TestScreen* test_screen = aura::TestScreen::Create(gfx::Size());
     gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen);
     gfx::Screen::SetScreenTypeDelegate(new ScreenTypeDelegateDesktop);
 #endif

content/browser/renderer_host/input/touch_emulator_unittest.cc

@@ -48,7 +48,7 @@ class TouchEmulatorTest : public testing::Test,
   virtual void SetUp() OVERRIDE {
 #if defined(USE_AURA)
     aura::Env::CreateInstance(true);
-    screen_.reset(aura::TestScreen::Create());
+    screen_.reset(aura::TestScreen::Create(gfx::Size()));
     gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get());
 #endif
 

content/browser/renderer_host/render_widget_host_unittest.cc

@@ -454,7 +454,7 @@ class RenderWidgetHostTest : public testing::Test {
     ImageTransportFactory::InitializeForUnitTests(
         scoped_ptr<ui::ContextFactory>(new ui::InProcessContextFactory));
     aura::Env::CreateInstance(true);
-    screen_.reset(aura::TestScreen::Create());
+    screen_.reset(aura::TestScreen::Create(gfx::Size()));
     gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get());
 #endif
     host_.reset(

content/shell/browser/shell_aura.cc

@@ -16,7 +16,7 @@ namespace content {
 // static
 void Shell::PlatformInitialize(const gfx::Size& default_window_size) {
   CHECK(!platform_);
-  aura::TestScreen* screen = aura::TestScreen::Create();
+  aura::TestScreen* screen = aura::TestScreen::Create(gfx::Size());
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen);
   platform_ = new ShellPlatformDataAura(default_window_size);
 }

content/shell/browser/shell_views.cc

@@ -423,8 +423,8 @@ void Shell::PlatformInitialize(const gfx::Size& default_window_size) {
 #endif
 #if defined(OS_CHROMEOS)
   chromeos::DBusThreadManager::Initialize();
-  gfx::Screen::SetScreenInstance(
-      gfx::SCREEN_TYPE_NATIVE, aura::TestScreen::Create());
+  gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE,
+                                 aura::TestScreen::Create(gfx::Size()));
   wm_test_helper_ = new wm::WMTestHelper(default_window_size,
                                          GetContextFactory());
 #else

ui/aura/demo/demo_main.cc

@@ -129,7 +129,8 @@ int DemoMain() {
 
   aura::Env::CreateInstance(true);
   aura::Env::GetInstance()->set_context_factory(context_factory.get());
-  scoped_ptr<aura::TestScreen> test_screen(aura::TestScreen::Create());
+  scoped_ptr<aura::TestScreen> test_screen(
+      aura::TestScreen::Create(gfx::Size()));
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen.get());
   scoped_ptr<aura::WindowTreeHost> host(
       test_screen->CreateHostForPrimaryDisplay());

ui/aura/test/aura_test_helper.cc

@@ -64,7 +64,8 @@ void AuraTestHelper::SetUp(ui::ContextFactory* context_factory) {
 
   ui::InitializeInputMethodForTesting();
 
-  test_screen_.reset(TestScreen::Create());
+  gfx::Size host_size(800, 600);
+  test_screen_.reset(TestScreen::Create(host_size));
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_.get());
   host_.reset(test_screen_->CreateHostForPrimaryDisplay());
 
@@ -79,7 +80,7 @@ void AuraTestHelper::SetUp(ui::ContextFactory* context_factory) {
 
   root_window()->Show();
   // Ensure width != height so tests won't confuse them.
-  host()->SetBounds(gfx::Rect(800, 600));
+  host()->SetBounds(gfx::Rect(host_size));
 }
 
 void AuraTestHelper::TearDown() {

ui/aura/test/test_screen.cc

@@ -17,10 +17,11 @@
 namespace aura {
 
 // static
-TestScreen* TestScreen::Create() {
+TestScreen* TestScreen::Create(const gfx::Size& size) {
+  const gfx::Size kDefaultSize(800, 600);
   // Use (0,0) because the desktop aura tests are executed in
   // native environment where the display's origin is (0,0).
-  return new TestScreen(gfx::Rect(0, 0, 800, 600));
+  return new TestScreen(gfx::Rect(size.IsEmpty() ? kDefaultSize : size));
 }
 
 // static

ui/aura/test/test_screen.h

@@ -23,7 +23,9 @@ class WindowTreeHost;
 class TestScreen : public gfx::Screen,
                    public WindowObserver {
  public:
-  static TestScreen* Create();
+  // Creates a gfx::Screen of the specified size. If no size is specified, then
+  // creates a 800x600 screen. |size| is in physical pixels.
+  static TestScreen* Create(const gfx::Size& size);
   // Creates a TestScreen that uses fullscreen for the display.
   static TestScreen* CreateFullscreen();
   virtual ~TestScreen();

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));
   // 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();