[Chromecast] Handle device scale factor correctly

chromecast/browser/cast_content_window.cc

 // Copyright 2014 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 "chromecast/browser/cast_content_window.h"
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "chromecast/base/metrics/cast_metrics_helper.h"
 #include "chromecast/browser/cast_browser_process.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "ipc/ipc_message.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 
 #if defined(USE_AURA)
 #include "chromecast/graphics/cast_screen.h"
 #include "ui/aura/env.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #endif
 
 namespace chromecast {
@@ skipping 34 matching lines @@
 }
 
 CastContentWindow::~CastContentWindow() {
 #if defined(USE_AURA)
   window_tree_host_.reset();
   // We don't delete the screen here to avoid a CHECK failure when
   // the screen size is queried periodically for metric gathering. b/18101124
 #endif
 }
 
-void CastContentWindow::CreateWindowTree(
-    const gfx::Size& initial_size,
-    content::WebContents* web_contents) {
+void CastContentWindow::CreateWindowTree(content::WebContents* web_contents) {
 #if defined(USE_AURA)
   // Aura initialization
-  CastScreen* cast_screen =
-      shell::CastBrowserProcess::GetInstance()->cast_screen();
-  if (!display::Screen::GetScreen())
-    display::Screen::SetScreenInstance(cast_screen);
-  if (cast_screen->GetPrimaryDisplay().size() != initial_size)
-    cast_screen->UpdateDisplaySize(initial_size);
-
+  DCHECK(display::Screen::GetScreen());
+  gfx::Size display_size =
+      display::Screen::GetScreen()->GetPrimaryDisplay().GetSizeInPixel();
   CHECK(aura::Env::GetInstance());
   window_tree_host_.reset(
-      aura::WindowTreeHost::Create(gfx::Rect(initial_size)));
+      aura::WindowTreeHost::Create(gfx::Rect(display_size)));
   window_tree_host_->InitHost();
   window_tree_host_->window()->SetLayoutManager(
       new CastFillLayout(window_tree_host_->window()));
 
   if (transparent_) {
     window_tree_host_->compositor()->SetBackgroundColor(SK_ColorTRANSPARENT);
     window_tree_host_->compositor()->SetHostHasTransparentBackground(true);
   } else {
     window_tree_host_->compositor()->SetBackgroundColor(SK_ColorBLACK);
   }
   window_tree_host_->Show();
 
   // Add and show content's view/window
   aura::Window* content_window = web_contents->GetNativeView();
   aura::Window* parent = window_tree_host_->window();
   if (!parent->Contains(content_window)) {
     parent->AddChild(content_window);
   }
   content_window->Show();
 #endif
 }
 
 std::unique_ptr<content::WebContents> CastContentWindow::CreateWebContents(
-    const gfx::Size& initial_size,
     content::BrowserContext* browser_context) {
+  CHECK(display::Screen::GetScreen());
+  gfx::Size display_size =
+      display::Screen::GetScreen()->GetPrimaryDisplay().size();
+
   content::WebContents::CreateParams create_params(browser_context, NULL);
   create_params.routing_id = MSG_ROUTING_NONE;
-  create_params.initial_size = initial_size;
+  create_params.initial_size = display_size;
   content::WebContents* web_contents = content::WebContents::Create(
       create_params);
   content::WebContentsObserver::Observe(web_contents);
   return base::WrapUnique(web_contents);
 }
 
 void CastContentWindow::DidFirstVisuallyNonEmptyPaint() {
   metrics::CastMetricsHelper::GetInstance()->LogTimeToFirstPaint();
 }
 
 void CastContentWindow::MediaStoppedPlaying(const MediaPlayerId& id) {
   metrics::CastMetricsHelper::GetInstance()->LogMediaPause();
 }
 
 void CastContentWindow::MediaStartedPlaying(const MediaPlayerId& id) {
   metrics::CastMetricsHelper::GetInstance()->LogMediaPlay();
 }
 
 void CastContentWindow::RenderViewCreated(
     content::RenderViewHost* render_view_host) {
   content::RenderWidgetHostView* view =
       render_view_host->GetWidget()->GetView();
   if (view)
     view->SetBackgroundColor(transparent_ ? SK_ColorTRANSPARENT
                                           : SK_ColorBLACK);
 }
 
 }  // namespace shell
 }  // namespace chromecast