chrome/browser/ui/views/frame/native_browser_frame_factory_chromeos.cc - Issue 2777223002: Gets chrome --mus some what working

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 2777223002: Gets chrome --mus some what working (Closed)

Patch Set: fix mac Created 3 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:

View unified diff | Download patch

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/chromeos/ash_config.h"

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

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

9 #include "services/service_manager/runner/common/client_util.h"	10 #include "services/service_manager/runner/common/client_util.h"

10	11

11 NativeBrowserFrame* NativeBrowserFrameFactory::Create(	12 NativeBrowserFrame* NativeBrowserFrameFactory::Create(

12 BrowserFrame* browser_frame,	13 BrowserFrame* browser_frame,

13 BrowserView* browser_view) {	14 BrowserView* browser_view) {

14 if (service_manager::ServiceManagerIsRemote())	15 if (chromeos::GetConfig() == ash::Config::MASH)

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

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

17 }	18 }

OLD	NEW

« no previous file with comments | « chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc ('k') | ui/aura/mus/window_manager_delegate.h » ('j') | no next file with comments »