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

Side by Side Diff: chrome/browser/ui/webui/mojo_web_ui_controller.cc

Issue 302573002: Add a Javascript wrapper around ServiceRegistry and expose it to WebUI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@render-view-shell
Patch Set: address comments Created 6 years, 4 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 unified diff | Download patch
OLDNEW
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_frame_host.h"
10 #include "content/public/browser/render_process_host.h" 9 #include "content/public/browser/render_process_host.h"
11 #include "content/public/browser/render_view_host.h"
12 #include "content/public/browser/web_ui_data_source.h" 10 #include "content/public/browser/web_ui_data_source.h"
13 #include "content/public/common/bindings_policy.h" 11 #include "content/public/common/bindings_policy.h"
14 #include "content/public/common/service_registry.h"
15 #include "mojo/public/cpp/system/core.h" 12 #include "mojo/public/cpp/system/core.h"
16 13
17 MojoWebUIController::MojoWebUIController(content::WebUI* contents) 14 MojoWebUIControllerBase::MojoWebUIControllerBase(content::WebUI* contents)
18 : WebUIController(contents), mojo_data_source_(NULL), weak_factory_(this) { 15 : WebUIController(contents), mojo_data_source_(NULL) {
19 } 16 }
20 17
21 MojoWebUIController::~MojoWebUIController() { 18 MojoWebUIControllerBase::~MojoWebUIControllerBase() {
22 } 19 }
23 20
24 void MojoWebUIController::RenderViewCreated( 21 void MojoWebUIControllerBase::RenderViewCreated(
25 content::RenderViewHost* render_view_host) { 22 content::RenderViewHost* render_view_host) {
26 render_view_host->AllowBindings(content::BINDINGS_POLICY_WEB_UI); 23 render_view_host->AllowBindings(content::BINDINGS_POLICY_WEB_UI);
27 render_view_host->GetMainFrame()->GetServiceRegistry()->AddService(
28 "webui_controller",
29 base::Bind(&MojoWebUIController::CreateAndStoreUIHandler,
30 weak_factory_.GetWeakPtr()));
31 } 24 }
32 25
33 void MojoWebUIController::AddMojoResourcePath(const std::string& path, 26 void MojoWebUIControllerBase::AddMojoResourcePath(const std::string& path,
34 int resource_id) { 27 int resource_id) {
35 if (!mojo_data_source_) { 28 if (!mojo_data_source_) {
36 mojo_data_source_ = content::WebUIDataSource::AddMojoDataSource( 29 mojo_data_source_ = content::WebUIDataSource::AddMojoDataSource(
37 Profile::FromWebUI(web_ui())); 30 Profile::FromWebUI(web_ui()));
38 } 31 }
39 mojo_data_source_->AddResourcePath(path, resource_id); 32 mojo_data_source_->AddResourcePath(path, resource_id);
40 } 33 }
41
42 void MojoWebUIController::CreateAndStoreUIHandler(
43 mojo::ScopedMessagePipeHandle handle) {
44 ui_handler_ = CreateUIHandler(handle.Pass());
45 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/mojo_web_ui_controller.h ('k') | chrome/browser/ui/webui/omnibox/omnibox_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698