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

Unified Diff: content/browser/webui/web_ui_mojo_browsertest.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: rebase Created 6 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/webui/web_ui_mojo_browsertest.cc
diff --git a/content/browser/webui/web_ui_mojo_browsertest.cc b/content/browser/webui/web_ui_mojo_browsertest.cc
index 6261316ab115d4cd2d9da02de1f60c54341da51a..ebb5bb1b90a35dd57c7615146caebbdd5dc4ccd9 100644
--- a/content/browser/webui/web_ui_mojo_browsertest.cc
+++ b/content/browser/webui/web_ui_mojo_browsertest.cc
@@ -59,10 +59,10 @@ bool GetResource(const std::string& id,
class BrowserTargetImpl : public BrowserTarget {
public:
- BrowserTargetImpl(mojo::ScopedMessagePipeHandle handle,
+ BrowserTargetImpl(mojo::InterfaceRequest<BrowserTarget> request,
base::RunLoop* run_loop)
: run_loop_(run_loop) {
- renderer_.Bind(handle.Pass());
+ renderer_.Bind(request.PassMessagePipe());
renderer_.set_client(this);
}
@@ -83,9 +83,9 @@ class BrowserTargetImpl : public BrowserTarget {
class PingBrowserTargetImpl : public BrowserTargetImpl {
public:
- PingBrowserTargetImpl(mojo::ScopedMessagePipeHandle handle,
+ PingBrowserTargetImpl(mojo::InterfaceRequest<BrowserTarget> request,
base::RunLoop* run_loop)
- : BrowserTargetImpl(handle.Pass(), run_loop) {
+ : BrowserTargetImpl(request.Pass(), run_loop) {
renderer_->Ping();
}
@@ -133,14 +133,14 @@ class PingTestWebUIController : public TestWebUIController {
// WebUIController overrides:
virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE {
- render_view_host->GetMainFrame()->GetServiceRegistry()->AddService(
- "webui_controller",
- base::Bind(&PingTestWebUIController::CreateHandler,
- base::Unretained(this)));
+ render_view_host->GetMainFrame()
+ ->GetServiceRegistry()
+ ->AddService<BrowserTarget>(base::Bind(
+ &PingTestWebUIController::CreateHandler, base::Unretained(this)));
}
- void CreateHandler(mojo::ScopedMessagePipeHandle handle) {
- browser_target_.reset(new PingBrowserTargetImpl(handle.Pass(), run_loop_));
+ void CreateHandler(mojo::InterfaceRequest<BrowserTarget> request) {
+ browser_target_.reset(new PingBrowserTargetImpl(request.Pass(), run_loop_));
}
private:

Powered by Google App Engine
This is Rietveld 408576698