Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Unified Diff: chromecast/browser/service/cast_service_simple.cc

Issue 2643553002: [Chromecast] Reuse the Aura window manager across receiver apps. (Closed)
Patch Set: fix unit tests Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromecast/browser/service/cast_service_simple.cc
diff --git a/chromecast/browser/service/cast_service_simple.cc b/chromecast/browser/service/cast_service_simple.cc
index 9cc0f78d7cb66b2cd09230dfd2c82411c3626e6e..35e7a3efb158cda1ee524e243fada5b78902ede7 100644
--- a/chromecast/browser/service/cast_service_simple.cc
+++ b/chromecast/browser/service/cast_service_simple.cc
@@ -9,6 +9,7 @@
#include "base/command_line.h"
#include "base/files/file_util.h"
#include "base/memory/ptr_util.h"
+#include "chromecast/graphics/cast_window_manager.h"
halliwell 2017/01/18 02:55:18 unnecessary
Joshua LeVasseur 2017/01/18 18:26:35 Done.
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
#include "net/base/filename_util.h"
@@ -36,11 +37,11 @@ GURL GetStartupURL() {
} // namespace
-CastServiceSimple::CastServiceSimple(
- content::BrowserContext* browser_context,
- PrefService* pref_service)
- : CastService(browser_context, pref_service) {
-}
+CastServiceSimple::CastServiceSimple(content::BrowserContext* browser_context,
+ PrefService* pref_service,
+ CastWindowManager* window_manager)
+ : CastService(browser_context, pref_service),
+ window_manager_(window_manager) {}
derekjchow1 2017/01/18 02:49:12 DCHECK(window_manager_);
Joshua LeVasseur 2017/01/18 18:26:35 Done.
CastServiceSimple::~CastServiceSimple() {
}
@@ -55,7 +56,7 @@ void CastServiceSimple::FinalizeInternal() {
void CastServiceSimple::StartInternal() {
window_ = CastContentWindow::Create(this);
web_contents_ = window_->CreateWebContents(browser_context());
- window_->ShowWebContents(web_contents_.get());
+ window_->ShowWebContents(web_contents_.get(), window_manager_);
web_contents_->GetController().LoadURL(startup_url_, content::Referrer(),
ui::PAGE_TRANSITION_TYPED,

Powered by Google App Engine
This is Rietveld 408576698