chrome/browser/ui/views/frame/native_browser_frame_factory_aurawin.cc - Issue 1442893002: Move Shell connection to content

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: chrome/browser/ui/views/frame/native_browser_frame_factory_aurawin.cc

Issue 1442893002: Move Shell connection to content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@i2

Patch Set: . Created 5 years, 1 month 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

« no previous file with comments | « chrome/browser/ui/views/frame/native_browser_frame_factory_auralinux.cc ('k') | chrome/browser/ui/views/frame/native_browser_frame_factory_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/frame/native_browser_frame_factory_aurawin.cc

diff --git a/chrome/browser/ui/views/frame/native_browser_frame_factory_aurawin.cc b/chrome/browser/ui/views/frame/native_browser_frame_factory_aurawin.cc

index efb82a5cd5c003a129240f7cca9f7b702139861c..0b01bf0305b4c82c46df0def378052bca0faaedc 100644

--- a/chrome/browser/ui/views/frame/native_browser_frame_factory_aurawin.cc

+++ b/chrome/browser/ui/views/frame/native_browser_frame_factory_aurawin.cc

@@ -5,19 +5,19 @@

#include "chrome/browser/ui/views/frame/native_browser_frame_factory.h"

#include "ash/shell.h"

-#include "chrome/browser/mojo_runner_util.h"

#include "chrome/browser/ui/views/frame/browser_frame_ashwin.h"

#include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h"

-#if defined(MOJO_RUNNER_CLIENT)

+#if defined(MOJO_SHELL_CLIENT)

#include "chrome/browser/ui/views/frame/browser_frame_mus.h"

+#include "content/public/common/mojo_shell_connection.h"

#endif

NativeBrowserFrame* NativeBrowserFrameFactory::Create(

BrowserFrame* browser_frame,

BrowserView* browser_view) {

-#if defined(MOJO_RUNNER_CLIENT)

- if (IsRunningInMojoRunner())

+#if defined(MOJO_SHELL_CLIENT)

+ if (content::MojoShellConnection::Get())

return new BrowserFrameMus(browser_frame, browser_view);

#endif