components/html_viewer/html_frame.cc - Issue 1245683004: Mandoline: Merge Surfaces and Views apps

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: components/html_viewer/html_frame.cc

Issue 1245683004: Mandoline: Merge Surfaces and Views apps (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed Rob's comments Created 5 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:

Index: components/html_viewer/html_frame.cc

diff --git a/components/html_viewer/html_frame.cc b/components/html_viewer/html_frame.cc

index af7ed2884f4880f4efb7cafac86c18670f454c84..99cb61547c3af5ad02f830b6a8172c5ebb17ef7d 100644

--- a/components/html_viewer/html_frame.cc

+++ b/components/html_viewer/html_frame.cc

@@ -580,7 +580,7 @@ void HTMLFrame::didChangeContents() {

void HTMLFrame::initializeLayerTreeView() {

mojo::URLRequestPtr request(mojo::URLRequest::New());

- request->url = mojo::String::From("mojo:surfaces_service");

+ request->url = mojo::String::From("mojo:view_manager");

rjkroege 2015/08/06 22:39:11 where does the cc::impl allocate mojo::<new thing

Fady Samuel 2015/08/07 01:15:21 You are probably referring to OutputSurfaceMojo ht

mojo::SurfacePtr surface;

GetLocalRootApp()->ConnectToService(request.Pass(), &surface);