mojo/shell/context.cc - Issue 514063003: Update view_manager and window_manager to make use of content handling.

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/shell/context.cc

Issue 514063003: Update view_manager and window_manager to make use of content handling. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@viewman2

Patch Set: 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 side-by-side diff with in-line comments

Download patch

« mojo/services/view_manager/view_manager_service_impl.cc ('K') | « mojo/services/view_manager/view_manager_unittest.cc ('k') | mojo/shell/dynamic_application_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/shell/context.cc

diff --git a/mojo/shell/context.cc b/mojo/shell/context.cc

index 706c511489a72a1f4564f3c3f22e7cc3536ee1c5..48fba5c98f915386569413409eb93e01d6d579c2 100644

--- a/mojo/shell/context.cc

+++ b/mojo/shell/context.cc

@@ -72,6 +72,11 @@ static base::LazyInstance<Setup>::Leaky setup = LAZY_INSTANCE_INITIALIZER;

void InitContentHandlers(DynamicApplicationLoader* loader,

base::CommandLine* command_line) {

+ // Default content handlers.

+ loader->RegisterContentHandler("image/png", GURL("mojo://mojo_png_viewer/"));

+ loader->RegisterContentHandler("text/html", GURL("mojo://mojo_html_viewer/"));

+ // Command-line-specified content handlers.

std::string handlers_spec = command_line->GetSwitchValueASCII(

switches::kContentHandlers);

if (handlers_spec.empty())