chrome/browser/ui/views/frame/native_browser_frame_factory_chromeos.cc - Issue 2208613002: Remove MOJO_SHELL_CLIENT define.

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 2208613002: Remove MOJO_SHELL_CLIENT define. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: tot merge Created 4 years, 4 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:

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/ui/views/frame/browser_frame_ash.h"	7 #include "chrome/browser/ui/views/frame/browser_frame_ash.h"

8

9 #if defined(MOJO_SHELL_CLIENT)

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

11 #include "services/shell/runner/common/client_util.h"	9 #include "services/shell/runner/common/client_util.h"

12 #endif

13	10

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

15 BrowserFrame* browser_frame,	12 BrowserFrame* browser_frame,

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

17 #if defined(MOJO_SHELL_CLIENT)

18 if (shell::ShellIsRemote())	14 if (shell::ShellIsRemote())

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

20 #endif

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

22 }	17 }

OLD	NEW