Chromium Code Reviews| 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 d2ac5b755a9678aa490b1a02851e52c738b56be7..3ea75b503088478c5d70eae83818d00aa0e7bb08 100644 |
| --- a/chromecast/browser/service/cast_service_simple.cc |
| +++ b/chromecast/browser/service/cast_service_simple.cc |
| @@ -9,11 +9,9 @@ |
| #include "base/command_line.h" |
| #include "base/files/file_util.h" |
| #include "base/memory/ptr_util.h" |
| -#include "content/public/browser/render_view_host.h" |
| #include "content/public/browser/web_contents.h" |
| #include "content/public/common/content_switches.h" |
| #include "net/base/filename_util.h" |
| -#include "net/url_request/url_request_context_getter.h" |
| namespace chromecast { |
| namespace shell { |
| @@ -60,26 +58,23 @@ void CastServiceSimple::StartInternal() { |
| return; |
| } |
| - window_ = CastContentWindow::Create(this); |
| - web_contents_ = window_->CreateWebContents(browser_context()); |
| - window_->ShowWebContents(web_contents_.get(), window_manager_); |
| - |
| - web_contents_->GetController().LoadURL(startup_url_, content::Referrer(), |
| - ui::PAGE_TRANSITION_TYPED, |
| - std::string()); |
| - web_contents_->Focus(); |
| + cast_web_view_ = |
| + base::MakeUnique<CastWebView>(this, browser_context(), nullptr, false); |
|
halliwell
2017/02/20 22:09:11
nit: comment what nullptr, false mean?
derekjchow1
2017/02/22 00:50:41
Done.
|
| + cast_web_view_->Show(window_manager_); |
| + cast_web_view_->LoadUrl(startup_url_); |
| } |
| void CastServiceSimple::StopInternal() { |
| - if (web_contents_) { |
| - web_contents_->ClosePage(); |
| - web_contents_.reset(); |
| - } |
| - if (window_) { |
| - window_.reset(); |
| + if (cast_web_view_) { |
| + cast_web_view_->ClosePage(); |
| } |
| + cast_web_view_.reset(); |
| } |
| +void CastServiceSimple::OnPageStopped(int error_code) {} |
| + |
| +void CastServiceSimple::OnLoadingStateChanged(bool loading) {} |
| + |
| void CastServiceSimple::OnWindowDestroyed() {} |
| void CastServiceSimple::OnKeyEvent(const ui::KeyEvent& key_event) {} |