SetDeviceScaleFactorForTest

content/shell/browser/shell_views.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/shell/browser/shell.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 16 matching lines @@
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/test/desktop_test_views_delegate.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 #if defined(OS_CHROMEOS)
-#include "ui/aura/test/test_screen.h"
 #include "ui/wm/test/wm_test_helper.h"
 #else  // !defined(OS_CHROMEOS)
 #include "ui/views/widget/desktop_aura/desktop_screen.h"
 #endif
 
 #if defined(OS_WIN)
 #include <fcntl.h>
 #include <io.h>
 #endif
 
@@ skipping 255 matching lines @@
   // Contents view contains the web contents view
   View* contents_view_;
   views::WebView* web_view_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellWindowDelegateView);
 };
 
 }  // namespace
 
 #if defined(OS_CHROMEOS)
-wm::WMTestHelper* Shell::wm_test_helper_ = NULL;
-display::Screen* Shell::test_screen_ = NULL;
+wm::WMTestHelper* wm_test_helper_ = NULL;
 #endif
-views::ViewsDelegate* Shell::views_delegate_ = NULL;
+views::ViewsDelegate* views_delegate_ = NULL;
 
 // static
 void Shell::PlatformInitialize(const gfx::Size& default_window_size) {
 #if defined(OS_WIN)
   _setmode(_fileno(stdout), _O_BINARY);
   _setmode(_fileno(stderr), _O_BINARY);
 #endif
 #if defined(OS_CHROMEOS)
-  test_screen_ = aura::TestScreen::Create(gfx::Size());
-  display::Screen::SetScreenInstance(test_screen_);
   wm_test_helper_ = new wm::WMTestHelper(default_window_size,
                                          GetContextFactory());
 #else
   display::Screen::SetScreenInstance(views::CreateDesktopScreen());
 #endif
   views_delegate_ = new views::DesktopTestViewsDelegate();
 }
 
 void Shell::PlatformExit() {
 #if defined(OS_CHROMEOS)
   delete wm_test_helper_;
   wm_test_helper_ = NULL;
-
-  delete test_screen_;
-  test_screen_ = NULL;
 #endif
   delete views_delegate_;
   views_delegate_ = NULL;
   delete platform_;
   platform_ = NULL;
 }
 
 void Shell::PlatformCleanUp() {
 }
 
@@ skipping 27 matching lines @@
 
 void Shell::PlatformCreateWindow(int width, int height) {
   if (headless_) {
     content_size_ = gfx::Size(width, height);
     if (!platform_)
       platform_ = new ShellPlatformDataAura(content_size_);
     else
       platform_->ResizeWindow(content_size_);
     return;
   }
-#if defined(OS_CHROMEOS)
-  window_widget_ = views::Widget::CreateWindowWithContextAndBounds(
-      new ShellWindowDelegateView(this),
-      wm_test_helper_->GetDefaultParent(NULL, NULL, gfx::Rect()),
-      gfx::Rect(0, 0, width, height));
-#else
   window_widget_ = new views::Widget;
   views::Widget::InitParams params;
   params.bounds = gfx::Rect(0, 0, width, height);
   params.delegate = new ShellWindowDelegateView(this);
   params.wm_class_class = "chromium-content_shell";
   params.wm_class_name = params.wm_class_class;
+#if defined(OS_CHROMEOS)
+  params.context = wm_test_helper_->host()->window();
+#endif
   window_widget_->Init(params);
-#endif
 
   content_size_ = gfx::Size(width, height);
 
   window_ = window_widget_->GetNativeWindow();
   // Call ShowRootWindow on RootWindow created by WMTestHelper without
   // which XWindow owned by RootWindow doesn't get mapped.
   window_->GetHost()->Show();
   window_widget_->Show();
 }
 
@@ skipping 31 matching lines @@
 void Shell::PlatformSetTitle(const base::string16& title) {
   if (headless_)
     return;
   ShellWindowDelegateView* delegate_view =
     static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
   delegate_view->SetWindowTitle(title);
   window_widget_->UpdateWindowTitle();
 }
 
 }  // namespace content