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 "chrome/browser/ui/webui/mojo_web_ui_controller.h" | 5 #include "chrome/browser/ui/webui/mojo_web_ui_controller.h" |
6 | 6 |
7 #include "chrome/browser/profiles/profile.h" | 7 #include "chrome/browser/profiles/profile.h" |
8 #include "chrome/browser/ui/webui/mojo_web_ui_handler.h" | 8 #include "chrome/browser/ui/webui/mojo_web_ui_handler.h" |
9 #include "content/public/browser/render_view_host.h" | 9 #include "content/public/browser/render_view_host.h" |
10 #include "content/public/browser/web_ui_data_source.h" | 10 #include "content/public/browser/web_ui_data_source.h" |
11 #include "content/public/common/bindings_policy.h" | 11 #include "content/public/common/bindings_policy.h" |
12 #include "mojo/public/cpp/bindings/interface.h" | 12 #include "mojo/public/cpp/system/core.h" |
13 | 13 |
14 MojoWebUIController::MojoWebUIController(content::WebUI* contents) | 14 MojoWebUIController::MojoWebUIController(content::WebUI* contents) |
15 : WebUIController(contents), | 15 : WebUIController(contents), |
16 mojo_data_source_(NULL) { | 16 mojo_data_source_(NULL) { |
17 } | 17 } |
18 | 18 |
19 MojoWebUIController::~MojoWebUIController() { | 19 MojoWebUIController::~MojoWebUIController() { |
20 } | 20 } |
21 | 21 |
22 void MojoWebUIController::RenderViewCreated( | 22 void MojoWebUIController::RenderViewCreated( |
23 content::RenderViewHost* render_view_host) { | 23 content::RenderViewHost* render_view_host) { |
24 render_view_host->AllowBindings(content::BINDINGS_POLICY_WEB_UI); | 24 render_view_host->AllowBindings(content::BINDINGS_POLICY_WEB_UI); |
25 | 25 |
26 mojo::InterfacePipe<mojo::AnyInterface, mojo::AnyInterface> pipe; | 26 mojo::MessagePipe pipe; |
27 ui_handler_ = CreateUIHandler(pipe.handle_to_peer.Pass()); | 27 ui_handler_ = CreateUIHandler(pipe.handle0.Pass()); |
28 render_view_host->SetWebUIHandle(pipe.handle_to_self.Pass()); | 28 render_view_host->SetWebUIHandle(pipe.handle1.Pass()); |
29 } | 29 } |
30 | 30 |
31 void MojoWebUIController::AddMojoResourcePath(const std::string& path, | 31 void MojoWebUIController::AddMojoResourcePath(const std::string& path, |
32 int resource_id) { | 32 int resource_id) { |
33 if (!mojo_data_source_) { | 33 if (!mojo_data_source_) { |
34 mojo_data_source_ = content::WebUIDataSource::AddMojoDataSource( | 34 mojo_data_source_ = content::WebUIDataSource::AddMojoDataSource( |
35 Profile::FromWebUI(web_ui())); | 35 Profile::FromWebUI(web_ui())); |
36 } | 36 } |
37 mojo_data_source_->AddResourcePath(path, resource_id); | 37 mojo_data_source_->AddResourcePath(path, resource_id); |
38 } | 38 } |
OLD | NEW |