mojo/services/html_viewer/html_document_view.cc - Issue 668483002: Change mojo URLs from mojo://mojo_foo to mojo://foo.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: mojo/services/html_viewer/html_document_view.cc

Issue 668483002: Change mojo URLs from mojo://mojo_foo to mojo://foo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 6 years, 2 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

« no previous file with comments | « mojo/services/html_viewer/blink_platform_impl.cc ('k') | mojo/services/native_viewport/native_viewport_impl.cc » ('j') | mojo/shell/mojo_url_resolver.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/services/html_viewer/html_document_view.cc

diff --git a/mojo/services/html_viewer/html_document_view.cc b/mojo/services/html_viewer/html_document_view.cc

index 400d8cab470c38587d8cf113c58a70c28e91d7e9..0ceb1012878201a47eafe87dca4dd618b484065e 100644

--- a/mojo/services/html_viewer/html_document_view.cc

+++ b/mojo/services/html_viewer/html_document_view.cc

@@ -154,14 +154,14 @@ blink::WebStorageNamespace* HTMLDocumentView::createSessionStorageNamespace() {

void HTMLDocumentView::initializeLayerTreeView() {

ServiceProviderPtr surfaces_service_provider;

- shell_->ConnectToApplication("mojo:mojo_surfaces_service",

+ shell_->ConnectToApplication("mojo:surfaces_service",

GetProxy(&surfaces_service_provider));

SurfacesServicePtr surfaces_service;

ConnectToService(surfaces_service_provider.get(), &surfaces_service);

ServiceProviderPtr gpu_service_provider;

- // TODO(jamesr): Should be mojo:mojo_gpu_service

- shell_->ConnectToApplication("mojo:mojo_native_viewport_service",

+ // TODO(jamesr): Should be mojo:gpu_service

+ shell_->ConnectToApplication("mojo:native_viewport_service",

GetProxy(&gpu_service_provider));

GpuPtr gpu_service;

ConnectToService(gpu_service_provider.get(), &gpu_service);