shell/context.cc - Issue 814273005: Move application_manager from /mojo to /shell.

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

Issue 814273005: Move application_manager from /mojo to /shell. (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Update include guards. Created 5 years, 11 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: shell/context.cc

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

index 76a907627e0340764e7ed8d9544aa06204353d86..d3a86132b5eea47a4d66fa25aa02a6d1e8cd091d 100644

--- a/shell/context.cc

+++ b/shell/context.cc

@@ -16,8 +16,6 @@

#include "base/strings/string_split.h"

#include "base/strings/string_util.h"

#include "build/build_config.h"

-#include "mojo/application_manager/application_loader.h"

-#include "mojo/application_manager/application_manager.h"

#include "mojo/common/tracing_impl.h"

#include "mojo/edk/embedder/embedder.h"

#include "mojo/edk/embedder/simple_platform_support.h"

@@ -25,6 +23,8 @@

#include "mojo/public/cpp/application/application_delegate.h"

#include "mojo/public/cpp/application/application_impl.h"

#include "services/tracing/tracing.mojom.h"

+#include "shell/application_manager/application_loader.h"

+#include "shell/application_manager/application_manager.h"

#include "shell/dynamic_application_loader.h"

#include "shell/external_application_listener.h"

#include "shell/in_process_dynamic_service_runner.h"

« no previous file with comments | « shell/context.h ('k') | shell/dynamic_application_loader.h » ('j') | no next file with comments »