content/browser/browser_main_loop.cc - Issue 1674903003: Extract shell methods from ApplicationImpl into a base class, and pass this to Initialize() instead.

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 1674903003: Extract shell methods from ApplicationImpl into a base class, and pass this to Initialize() instead. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojom

Patch Set: . Created 4 years, 10 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

Index: content/browser/browser_main_loop.cc

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

index 517240341ad6a3948ea18fb259e9eafa534ed0ba..b994ed06d2709424d0d076b9b92d0c713e19f53a 100644

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

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

@@ -179,7 +179,7 @@

#if defined(MOJO_SHELL_CLIENT)

#include "content/common/mojo/mojo_shell_connection_impl.h"

#include "mojo/converters/network/network_type_converters.h"

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

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

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

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

#endif

@@ -921,7 +921,7 @@ int BrowserMainLoop::PreMainMessageLoopRun() {

MojoShellConnectionImpl::Get()->BindToCommandLinePlatformChannel();

#if defined(USE_AURA)

views::WindowManagerConnection::Create(

- MojoShellConnection::Get()->GetApplication());

+ MojoShellConnection::Get()->GetShell());

#endif

}

#endif

« no previous file with comments | « components/web_view/web_view_impl.cc ('k') | content/browser/mojo/mojo_shell_client_host.cc » ('j') | no next file with comments »