OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "components/html_viewer/html_viewer.h" | 5 #include "components/html_viewer/html_viewer.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "components/html_viewer/content_handler_impl.h" | 9 #include "components/html_viewer/content_handler_impl.h" |
10 #include "components/html_viewer/global_state.h" | 10 #include "components/html_viewer/global_state.h" |
11 #include "mojo/shell/public/cpp/application_connection.h" | 11 #include "mojo/shell/public/cpp/application_connection.h" |
12 | 12 |
13 namespace html_viewer { | 13 namespace html_viewer { |
14 | 14 |
15 HTMLViewer::HTMLViewer() : app_(nullptr) { | 15 HTMLViewer::HTMLViewer() : shell_(nullptr) { |
16 } | 16 } |
17 | 17 |
18 HTMLViewer::~HTMLViewer() { | 18 HTMLViewer::~HTMLViewer() { |
19 } | 19 } |
20 | 20 |
21 void HTMLViewer::Initialize(mojo::ApplicationImpl* app) { | 21 void HTMLViewer::Initialize(mojo::Shell* shell, const std::string& url, |
22 app_ = app; | 22 uint32_t id) { |
23 global_state_.reset(new GlobalState(app)); | 23 shell_ = shell; |
| 24 global_state_.reset(new GlobalState(shell, url)); |
24 } | 25 } |
25 | 26 |
26 bool HTMLViewer::AcceptConnection( | 27 bool HTMLViewer::AcceptConnection( |
27 mojo::ApplicationConnection* connection) { | 28 mojo::ApplicationConnection* connection) { |
28 connection->AddService(this); | 29 connection->AddService(this); |
29 return true; | 30 return true; |
30 } | 31 } |
31 | 32 |
32 void HTMLViewer::Create( | 33 void HTMLViewer::Create( |
33 mojo::ApplicationConnection* connection, | 34 mojo::ApplicationConnection* connection, |
34 mojo::InterfaceRequest<mojo::shell::mojom::ContentHandler> request) { | 35 mojo::InterfaceRequest<mojo::shell::mojom::ContentHandler> request) { |
35 new ContentHandlerImpl(global_state_.get(), app_, std::move(request)); | 36 new ContentHandlerImpl(global_state_.get(), shell_, std::move(request)); |
36 } | 37 } |
37 | 38 |
38 } // namespace html_viewer | 39 } // namespace html_viewer |
OLD | NEW |