content/browser/browser_main_loop.cc - Issue 1877753003: Move mojo\shell to services\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: content/browser/browser_main_loop.cc

Issue 1877753003: Move mojo\shell to services\shell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@62scan

Patch Set: . Created 4 years, 8 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: content/browser/browser_main_loop.cc

diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc

index 65e88aced2e3117ad82bb6682e2fccfdfa859280..534be27e3a0908af510ae3090488870fba8b8648 100644

--- a/content/browser/browser_main_loop.cc

+++ b/content/browser/browser_main_loop.cc

@@ -80,10 +80,10 @@

#include "media/base/user_input_monitor.h"

#include "media/midi/midi_manager.h"

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

-#include "mojo/shell/public/cpp/shell.h"

#include "net/base/network_change_notifier.h"

#include "net/socket/client_socket_factory.h"

#include "net/ssl/ssl_config_service.h"

+#include "services/shell/public/cpp/shell.h"

#include "skia/ext/event_tracer_impl.h"

#include "skia/ext/skia_memory_dump_provider.h"

#include "sql/sql_memory_dump_provider.h"

@@ -181,7 +181,7 @@

#endif

#if defined(MOJO_SHELL_CLIENT)

-#include "mojo/shell/public/cpp/connector.h"

+#include "services/shell/public/cpp/connector.h"

#include "ui/views/mus/window_manager_connection.h"

#endif

« no previous file with comments | « content/browser/DEPS ('k') | content/browser/frame_host/frame_mojo_shell.h » ('j') | no next file with comments »