chrome/browser/ui/views/frame/native_browser_frame_factory.cc - Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType

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

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl

Patch Set: Fix build on Mac and CrOS Created 5 years, 3 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/frame/native_browser_frame_factory.h ('k') | chrome/browser/ui/views/frame/native_browser_frame_factory_aurawin.cc » ('j') | ui/gfx/host_desktop_type.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

8	8

9 namespace {	9 namespace {

10	10

(...skipping 11 matching lines...) Expand all Loading...
22 }	22 }

23	23

24 // static	24 // static

25 void NativeBrowserFrameFactory::Set(NativeBrowserFrameFactory* new_factory) {	25 void NativeBrowserFrameFactory::Set(NativeBrowserFrameFactory* new_factory) {

26 delete factory;	26 delete factory;

27 factory = new_factory;	27 factory = new_factory;

28 }	28 }

29	29

30 #if !defined(OS_WIN)	30 #if !defined(OS_WIN)

31 // static	31 // static

32 chrome::HostDesktopType NativeBrowserFrameFactory::AdjustHostDesktopType(	32 ui::HostDesktopType NativeBrowserFrameFactory::AdjustHostDesktopType(

33 chrome::HostDesktopType desktop_type) {	33 ui::HostDesktopType desktop_type) {

34 return desktop_type;	34 return desktop_type;

35 }	35 }

36 #endif // !defined(OS_WIN)	36 #endif // !defined(OS_WIN)

37	37

38 #if !defined(USE_ASH) \|\| defined(OS_CHROMEOS)	38 #if !defined(USE_ASH) \|\| defined(OS_CHROMEOS)

39 // static	39 // static

40 bool NativeBrowserFrameFactory::ShouldCreateForAshDesktop(	40 bool NativeBrowserFrameFactory::ShouldCreateForAshDesktop(

41 BrowserView* browser_view) {	41 BrowserView* browser_view) {

42 NOTREACHED();	42 NOTREACHED();

43 return false;	43 return false;

44 }	44 }

45 #endif // !defined(OS_WIN) \|\| !defined(USE_ASH)	45 #endif // !defined(OS_WIN) \|\| !defined(USE_ASH)

OLD	NEW