[Chromecast] Handle device scale factor correctly

chromecast/browser/cast_browser_main_parts.cc

Index: chromecast/browser/cast_browser_main_parts.cc
diff --git a/chromecast/browser/cast_browser_main_parts.cc b/chromecast/browser/cast_browser_main_parts.cc
index 6d278e289808c7d06f6da53c15d345e25838033f..ba7c8ba0bb411991f83d0a53ff47037aa0b3f8ea 100644
--- a/chromecast/browser/cast_browser_main_parts.cc
+++ b/chromecast/browser/cast_browser_main_parts.cc
@@ -45,6 +45,7 @@
 #include "chromecast/net/connectivity_checker.h"
 #include "chromecast/public/cast_media_shlib.h"
 #include "chromecast/public/cast_sys_info.h"
+#include "chromecast/public/graphics_properties_shlib.h"
 #include "chromecast/service/cast_service.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "content/public/browser/browser_thread.h"
@@ -368,11 +369,14 @@ int CastBrowserMainParts::PreCreateThreads() {
 #endif
 
 #if defined(USE_AURA)

[alokp, 2016/05/12 21:35:16]

nit: move the logic to determine display size into a function

[halliwell, 2016/05/13 23:48:03]

Done (also moved it into CastScreen source file).

-  // Screen can (and should) exist even with no displays connected. Its presence
-  // is assumed as an interface to access display information, e.g. from metrics
-  // code.  See CastContentWindow::CreateWindowTree for update when resolution
-  // is available.
-  cast_browser_process_->SetCastScreen(base::WrapUnique(new CastScreen));
+  gfx::Size display_size(1280, 720);

[alokp, 2016/05/12 21:35:16]

nit: make this more explicit by defining a kDefaultDisplaySize here or at the
top of this file.

[halliwell, 2016/05/13 23:48:03]

no need now it's in a helper.

+  if (GraphicsPropertiesShlib::IsSupported(
+          GraphicsPropertiesShlib::k1080p,
+          base::CommandLine::ForCurrentProcess()->argv()))

[alokp, 2016/05/12 21:35:16]

nit: braces for multi-line if blocks

[halliwell, 2016/05/13 23:48:03]

Done.

+    display_size = gfx::Size(1920, 1080);
+
+  cast_browser_process_->SetCastScreen(
+      base::WrapUnique(new CastScreen(display_size)));
   DCHECK(!display::Screen::GetScreen());
   display::Screen::SetScreenInstance(cast_browser_process_->cast_screen());
 #endif
@@ -424,11 +428,10 @@ void CastBrowserMainParts::PreMainMessageLoopRun() {
   // TODO(halliwell) move audio builds to use ozone_platform_cast, then can
   // simplify this by removing DISABLE_DISPLAY condition.  Should then also
   // assert(ozone_platform_cast) in BUILD.gn where it depends on //ui/ozone.
-  video_plane_controller_.reset(
-      new media::VideoPlaneController(GetMediaTaskRunner()));
-  cast_browser_process_->cast_screen()->SetDisplayResizeCallback(
-      base::Bind(&media::VideoPlaneController::SetGraphicsPlaneResolution,
-                 base::Unretained(video_plane_controller_.get())));
+  gfx::Size display_size =
+      display::Screen::GetScreen()->GetPrimaryDisplay().GetSizeInPixel();
+  video_plane_controller_.reset(new media::VideoPlaneController(
+      Size(display_size.width(), display_size.height()), GetMediaTaskRunner()));
   ui::OverlayManagerCast::SetOverlayCompositedCallback(
       base::Bind(&media::VideoPlaneController::SetGeometry,
                  base::Unretained(video_plane_controller_.get())));