| Index: chromecast/browser/cast_content_window_linux.h
|
| diff --git a/chromecast/browser/cast_content_window_linux.h b/chromecast/browser/cast_content_window_linux.h
|
| index 98d9c04116fde6b722a45bfa76948d956fa1e84e..1b8582ee02d30b3ef09f87fcd947f916e7d14f6b 100644
|
| --- a/chromecast/browser/cast_content_window_linux.h
|
| +++ b/chromecast/browser/cast_content_window_linux.h
|
| @@ -9,14 +9,9 @@
|
|
|
| #include "base/macros.h"
|
| #include "chromecast/browser/cast_content_window.h"
|
| -#include "chromecast/graphics/cast_vsync_settings.h"
|
| #include "content/public/browser/web_contents_observer.h"
|
| #include "ui/events/keycodes/keyboard_codes.h"
|
|
|
| -namespace aura {
|
| -class WindowTreeHost;
|
| -}
|
| -
|
| namespace content {
|
| class BrowserContext;
|
| class WebContents;
|
| @@ -26,15 +21,15 @@ namespace chromecast {
|
| namespace shell {
|
|
|
| class CastContentWindowLinux : public CastContentWindow,
|
| - public content::WebContentsObserver,
|
| - public CastVSyncSettings::Observer {
|
| + public content::WebContentsObserver {
|
| public:
|
| // Removes the window from the screen.
|
| ~CastContentWindowLinux() override;
|
|
|
| // CastContentWindow implementation.
|
| void SetTransparent() override;
|
| - void ShowWebContents(content::WebContents* web_contents) override;
|
| + void ShowWebContents(content::WebContents* web_contents,
|
| + CastWindowManager* window_manager) override;
|
| std::unique_ptr<content::WebContents> CreateWebContents(
|
| content::BrowserContext* browser_context) override;
|
|
|
| @@ -46,18 +41,12 @@ class CastContentWindowLinux : public CastContentWindow,
|
| const MediaPlayerId& id) override;
|
| void RenderViewCreated(content::RenderViewHost* render_view_host) override;
|
|
|
| - // CastVSyncSettings::Observer implementation:
|
| - void OnVSyncIntervalChanged(base::TimeDelta interval) override;
|
| -
|
| private:
|
| friend class CastContentWindow;
|
|
|
| // This class should only be instantiated by CastContentWindow::Create.
|
| CastContentWindowLinux();
|
|
|
| -#if defined(USE_AURA)
|
| - std::unique_ptr<aura::WindowTreeHost> window_tree_host_;
|
| -#endif
|
| bool transparent_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(CastContentWindowLinux);
|
|
|