mojo/services/view_manager/display_manager.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/view_manager/display_manager.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/test_service/test_time_service_impl.cc ('k') | mojo/services/view_manager/view_manager_unittest.cc » ('j') | mojo/shell/mojo_url_resolver.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/services/view_manager/display_manager.cc

diff --git a/mojo/services/view_manager/display_manager.cc b/mojo/services/view_manager/display_manager.cc

index 06162d18ee6f25708065dbf28546a99c5be76229..548817730d000204482a9c64a0edf7a2468776f1 100644

--- a/mojo/services/view_manager/display_manager.cc

+++ b/mojo/services/view_manager/display_manager.cc

@@ -77,7 +77,7 @@ DisplayManager::DisplayManager(

size_(800, 600),

draw_timer_(false, false),

weak_factory_(this) {

- app_connection->ConnectToService("mojo:mojo_native_viewport_service",

+ app_connection->ConnectToService("mojo:native_viewport_service",

&native_viewport_);

native_viewport_.set_client(this);

native_viewport_->Create(

@@ -85,8 +85,7 @@ DisplayManager::DisplayManager(

base::Bind(&DisplayManager::OnCreatedNativeViewport,

weak_factory_.GetWeakPtr()));

native_viewport_->Show();

- app_connection->ConnectToService("mojo:mojo_surfaces_service",

- &surfaces_service_);

+ app_connection->ConnectToService("mojo:surfaces_service", &surfaces_service_);

surfaces_service_->CreateSurfaceConnection(base::Bind(

&DisplayManager::OnSurfaceConnectionCreated, weak_factory_.GetWeakPtr()));

}