Index: chromecast/browser/cast_content_window.cc |
diff --git a/chromecast/browser/cast_content_window.cc b/chromecast/browser/cast_content_window.cc |
index 61d3fce26c75d8038704eb547b25e04956de7588..a923c3d413b63b1b29f4a459770eaf823d21157f 100644 |
--- a/chromecast/browser/cast_content_window.cc |
+++ b/chromecast/browser/cast_content_window.cc |
@@ -6,107 +6,26 @@ |
#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" |
#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 { |
namespace shell { |
-#if defined(USE_AURA) |
-class CastFillLayout : public aura::LayoutManager { |
- public: |
- explicit CastFillLayout(aura::Window* root) : root_(root) {} |
- ~CastFillLayout() override {} |
- |
- private: |
- void OnWindowResized() override {} |
- |
- void OnWindowAddedToLayout(aura::Window* child) override { |
- child->SetBounds(root_->bounds()); |
- } |
- |
- void OnWillRemoveWindowFromLayout(aura::Window* child) override {} |
- |
- void OnWindowRemovedFromLayout(aura::Window* child) override {} |
- |
- void OnChildWindowVisibilityChanged(aura::Window* child, |
- bool visible) override {} |
- |
- void SetChildBounds(aura::Window* child, |
- const gfx::Rect& requested_bounds) override { |
- SetChildBoundsDirect(child, requested_bounds); |
- } |
- |
- aura::Window* root_; |
- |
- DISALLOW_COPY_AND_ASSIGN(CastFillLayout); |
-}; |
-#endif |
- |
CastContentWindow::CastContentWindow() : transparent_(false) { |
} |
-CastContentWindow::~CastContentWindow() { |
-#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 |
-#endif |
-} |
- |
-void CastContentWindow::CreateWindowTree(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()->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); |
- } |
- |
- CastVSyncSettings::GetInstance()->AddObserver(this); |
- window_tree_host_->compositor()->SetAuthoritativeVSyncInterval( |
- CastVSyncSettings::GetInstance()->GetVSyncInterval()); |
- |
- 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 |
-} |
+CastContentWindow::~CastContentWindow() { } |
std::unique_ptr<content::WebContents> CastContentWindow::CreateWebContents( |
content::BrowserContext* browser_context) { |
@@ -147,16 +66,10 @@ void CastContentWindow::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) { |
-#if defined(USE_AURA) |
- window_tree_host_->compositor()->SetAuthoritativeVSyncInterval( |
- interval); |
-#endif |
+ } |
} |
} // namespace shell |