OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chromecast/browser/service/cast_service_simple.h" | 5 #include "chromecast/browser/service/cast_service_simple.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/files/file_util.h" | 8 #include "base/files/file_util.h" |
| 9 #include "base/memory/ptr_util.h" |
9 #include "chromecast/browser/cast_content_window.h" | 10 #include "chromecast/browser/cast_content_window.h" |
10 #include "content/public/browser/render_view_host.h" | 11 #include "content/public/browser/render_view_host.h" |
11 #include "content/public/browser/web_contents.h" | 12 #include "content/public/browser/web_contents.h" |
12 #include "net/base/filename_util.h" | 13 #include "net/base/filename_util.h" |
13 #include "net/url_request/url_request_context_getter.h" | 14 #include "net/url_request/url_request_context_getter.h" |
14 | 15 |
15 namespace chromecast { | 16 namespace chromecast { |
16 namespace shell { | 17 namespace shell { |
17 | 18 |
18 namespace { | 19 namespace { |
(...skipping 25 matching lines...) Expand all Loading... |
44 } | 45 } |
45 | 46 |
46 void CastServiceSimple::InitializeInternal() { | 47 void CastServiceSimple::InitializeInternal() { |
47 startup_url_ = GetStartupURL(); | 48 startup_url_ = GetStartupURL(); |
48 } | 49 } |
49 | 50 |
50 void CastServiceSimple::FinalizeInternal() { | 51 void CastServiceSimple::FinalizeInternal() { |
51 } | 52 } |
52 | 53 |
53 void CastServiceSimple::StartInternal() { | 54 void CastServiceSimple::StartInternal() { |
54 window_.reset(new CastContentWindow); | 55 window_ = CastContentWindow::Create(nullptr); |
55 web_contents_ = window_->CreateWebContents(browser_context()); | 56 web_contents_ = window_->CreateWebContents(browser_context()); |
56 window_->CreateWindowTree(web_contents_.get()); | 57 window_->ShowWebContents(web_contents_.get()); |
57 | 58 |
58 web_contents_->GetController().LoadURL(startup_url_, content::Referrer(), | 59 web_contents_->GetController().LoadURL(startup_url_, content::Referrer(), |
59 ui::PAGE_TRANSITION_TYPED, | 60 ui::PAGE_TRANSITION_TYPED, |
60 std::string()); | 61 std::string()); |
61 } | 62 } |
62 | 63 |
63 void CastServiceSimple::StopInternal() { | 64 void CastServiceSimple::StopInternal() { |
64 web_contents_->ClosePage(); | 65 web_contents_->ClosePage(); |
65 web_contents_.reset(); | 66 web_contents_.reset(); |
66 window_.reset(); | 67 window_.reset(); |
67 } | 68 } |
68 | 69 |
69 } // namespace shell | 70 } // namespace shell |
70 } // namespace chromecast | 71 } // namespace chromecast |
OLD | NEW |