Chromium Code Reviews| 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 22df7643d29d8ef8f303780d6314dfff2fe0b782..b90d314097bcaa8a39112ecf25fc6f4b37213644 100644 |
| --- a/chromecast/browser/cast_browser_main_parts.cc |
| +++ b/chromecast/browser/cast_browser_main_parts.cc |
| @@ -32,6 +32,7 @@ |
| #include "chromecast/browser/cast_content_browser_client.h" |
| #include "chromecast/browser/cast_memory_pressure_monitor.h" |
| #include "chromecast/browser/cast_net_log.h" |
| +#include "chromecast/browser/cast_window_manager.h" |
| #include "chromecast/browser/devtools/remote_debugging_server.h" |
| #include "chromecast/browser/geolocation/cast_access_token_store.h" |
| #include "chromecast/browser/media/media_caps_impl.h" |
| @@ -82,6 +83,7 @@ |
| // gn check ignored on OverlayManagerCast as it's not a public ozone |
| // header, but is exported to allow injecting the overlay-composited |
| // callback. |
| +#include "chromecast/browser/cast_window_manager_aura.h" |
| #include "chromecast/graphics/cast_screen.h" |
| #include "ui/display/screen.h" |
| #include "ui/ozone/platform/cast/overlay_manager_cast.h" // nogncheck |
| @@ -453,6 +455,12 @@ void CastBrowserMainParts::PreMainMessageLoopRun() { |
| cast_browser_process_->browser_client() |
| ->EnableRemoteDebuggingImmediately())); |
| +#if defined(USE_AURA) |
| + cast_window_manager_.reset(new CastWindowManagerAura()); |
|
derekjchow1
2016/10/24 22:43:08
Any reason this can't be added in the contructor o
|
| +#else |
| + cast_window_manager_.reset(new CastWindowManager()); |
| +#endif |
| + |
| #if defined(USE_AURA) && !BUILDFLAG(IS_CAST_AUDIO_ONLY) |
| // TODO(halliwell) move audio builds to use ozone_platform_cast, then can |
| // simplify this by removing IS_CAST_AUDIO_ONLY condition. Should then also |
| @@ -471,7 +479,8 @@ void CastBrowserMainParts::PreMainMessageLoopRun() { |
| cast_browser_process_->browser_context(), |
| cast_browser_process_->pref_service(), |
| url_request_context_factory_->GetSystemGetter(), |
| - video_plane_controller_.get())); |
| + video_plane_controller_.get(), |
| + cast_window_manager_.get())); |
| cast_browser_process_->cast_service()->Initialize(); |
| #if !defined(OS_ANDROID) |