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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/views/frame/native_browser_frame_factory_chromeos.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 unified diff | Download patch

« no previous file with comments | « chrome/browser/ui/views/frame/native_browser_frame_factory_aurawin.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

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

6	6

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

8 #include "chrome/browser/ui/views/frame/browser_frame_ash.h"	7 #include "chrome/browser/ui/views/frame/browser_frame_ash.h"

9	8

10 #if defined(MOJO_RUNNER_CLIENT)	9 #if defined(MOJO_SHELL_CLIENT)

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

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

12 #endif	12 #endif

13	13

14 NativeBrowserFrame* NativeBrowserFrameFactory::Create(	14 NativeBrowserFrame* NativeBrowserFrameFactory::Create(

15 BrowserFrame* browser_frame,	15 BrowserFrame* browser_frame,

16 BrowserView* browser_view) {	16 BrowserView* browser_view) {

17 #if defined(MOJO_RUNNER_CLIENT)	17 #if defined(MOJO_SHELL_CLIENT)

18 if (IsRunningInMojoRunner())	18 if (content::MojoShellConnection::Get())

19 return new BrowserFrameMus(browser_frame, browser_view);	19 return new BrowserFrameMus(browser_frame, browser_view);

20 #endif	20 #endif

21 return new BrowserFrameAsh(browser_frame, browser_view);	21 return new BrowserFrameAsh(browser_frame, browser_view);

22 }	22 }

OLD	NEW