[Chromecast] Turn CastContentWindow into an abstract interface.

chromecast/browser/cast_content_window_linux.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 "chromecast/browser/cast_content_window_linux.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 "chromecast/graphics/cast_vsync_settings.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"
@@ skipping 37 matching lines @@
                       const gfx::Rect& requested_bounds) override {
     SetChildBoundsDirect(child, requested_bounds);
   }
 
   aura::Window* root_;
 
   DISALLOW_COPY_AND_ASSIGN(CastFillLayout);
 };
 #endif
 
-CastContentWindow::CastContentWindow() : transparent_(false) {
+// static
+std::unique_ptr<CastContentWindow> CastContentWindow::Create(
+    CastContentWindow::Delegate* delegate) {
+  return base::MakeUnique<CastContentWindowLinux>();

[alokp, 2017/01/05 22:04:51]

Is dropping the delegate intentional?

[derekjchow1, 2017/01/05 22:27:24]

Correct. The Linux version of CastContentWindow doesn't use the delegate .

 }
 
-CastContentWindow::~CastContentWindow() {
+CastContentWindowLinux::CastContentWindowLinux() : transparent_(false) {}
+
+CastContentWindowLinux::~CastContentWindowLinux() {
 #if defined(USE_AURA)
   CastVSyncSettings::GetInstance()->RemoveObserver(this);
   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
+// 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(content::WebContents* web_contents) {
+void CastContentWindowLinux::SetTransparent() {
+  DCHECK(!window_tree_host_);
+  transparent_ = true;
+}
+
+void CastContentWindowLinux::ShowWebContents(
+    content::WebContents* web_contents) {
 #if defined(USE_AURA)
   // Aura initialization
   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(display_size)));
   window_tree_host_->InitHost();
   window_tree_host_->window()->Show();
@@ skipping 16 matching lines @@
   // 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(
+std::unique_ptr<content::WebContents> CastContentWindowLinux::CreateWebContents(
     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 = display_size;
-  content::WebContents* web_contents = content::WebContents::Create(
-      create_params);
+  content::WebContents* web_contents =
+      content::WebContents::Create(create_params);
 
 #if defined(USE_AURA)
   // Resize window
   aura::Window* content_window = web_contents->GetNativeView();
-  content_window->SetBounds(gfx::Rect(display_size.width(),
-                                      display_size.height()));
+  content_window->SetBounds(
+      gfx::Rect(display_size.width(), display_size.height()));
 #endif
 
   content::WebContentsObserver::Observe(web_contents);
   return base::WrapUnique(web_contents);
 }
 
-void CastContentWindow::DidFirstVisuallyNonEmptyPaint() {
+void CastContentWindowLinux::DidFirstVisuallyNonEmptyPaint() {
   metrics::CastMetricsHelper::GetInstance()->LogTimeToFirstPaint();
 }
 
-void CastContentWindow::MediaStoppedPlaying(const MediaPlayerInfo& media_info,
-                                            const MediaPlayerId& id) {
+void CastContentWindowLinux::MediaStoppedPlaying(
+    const MediaPlayerInfo& media_info,
+    const MediaPlayerId& id) {
   metrics::CastMetricsHelper::GetInstance()->LogMediaPause();
 }
 
-void CastContentWindow::MediaStartedPlaying(const MediaPlayerInfo& media_info,
-                                            const MediaPlayerId& id) {
+void CastContentWindowLinux::MediaStartedPlaying(
+    const MediaPlayerInfo& media_info,
+    const MediaPlayerId& id) {
   metrics::CastMetricsHelper::GetInstance()->LogMediaPlay();
 }
 
-void CastContentWindow::RenderViewCreated(
+void CastContentWindowLinux::RenderViewCreated(
     content::RenderViewHost* render_view_host) {
   content::RenderWidgetHostView* view =
       render_view_host->GetWidget()->GetView();
-  if (view)
+  if (view) {
     view->SetBackgroundColor(transparent_ ? SK_ColorTRANSPARENT
                                           : SK_ColorBLACK);
+  }
 }
 
-void CastContentWindow::OnVSyncIntervalChanged(base::TimeDelta interval) {
+void CastContentWindowLinux::OnVSyncIntervalChanged(base::TimeDelta interval) {
 #if defined(USE_AURA)
-  window_tree_host_->compositor()->SetAuthoritativeVSyncInterval(
-      interval);
+  window_tree_host_->compositor()->SetAuthoritativeVSyncInterval(interval);
 #endif
 }
 
 }  // namespace shell
 }  // namespace chromecast