chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc - Issue 2419723002: Move services/shell to services/service_manager

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/browser_non_client_frame_view_factory_views.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)

Patch Set: rebase Created 4 years, 2 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

« no previous file with comments | « chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc ('k') | chrome/browser/ui/views/frame/native_browser_frame_factory_auralinux.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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 "build/build_config.h"	5 #include "build/build_config.h"

6 #include "chrome/browser/ui/views/frame/browser_view.h"	6 #include "chrome/browser/ui/views/frame/browser_view.h"

7	7

8 #if defined(USE_AURA)	8 #if defined(USE_AURA)

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

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

11 #endif	11 #endif

12	12

13 #if !defined(OS_CHROMEOS)	13 #if !defined(OS_CHROMEOS)

14 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"	14 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"

15 #endif	15 #endif

16	16

17 #if defined(OS_WIN)	17 #if defined(OS_WIN)

18 #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h"	18 #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h"

19 #endif	19 #endif

20	20

(...skipping 22 matching lines...) Expand all Loading...
43 #else	43 #else

44 #if defined(OS_WIN)	44 #if defined(OS_WIN)

45 if (frame->ShouldUseNativeFrame())	45 if (frame->ShouldUseNativeFrame())

46 return new GlassBrowserFrameView(frame, browser_view);	46 return new GlassBrowserFrameView(frame, browser_view);

47 #endif	47 #endif

48 return new OpaqueBrowserFrameView(frame, browser_view);	48 return new OpaqueBrowserFrameView(frame, browser_view);

49 #endif // USE_ASH	49 #endif // USE_ASH

50 }	50 }

51	51

52 } // namespace chrome	52 } // namespace chrome

OLD	NEW