ui/views/test/test_views_delegate.cc - Issue 10909223: views: Rename win-aura flag to desktop-aura.

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: ui/views/test/test_views_delegate.cc

Issue 10909223: views: Rename win-aura flag to desktop-aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc ('k') | ui/views/views_switches.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 "ui/views/test/test_views_delegate.h"	5 #include "ui/views/test/test_views_delegate.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "base/logging.h"	8 #include "base/logging.h"

9 #include "content/public/test/web_contents_tester.h"	9 #include "content/public/test/web_contents_tester.h"

10 #include "ui/views/views_switches.h"	10 #include "ui/views/views_switches.h"

(...skipping 54 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
65 content::WebContents* TestViewsDelegate::CreateWebContents(	65 content::WebContents* TestViewsDelegate::CreateWebContents(

66 content::BrowserContext* browser_context,	66 content::BrowserContext* browser_context,

67 content::SiteInstance* site_instance) {	67 content::SiteInstance* site_instance) {

68 return NULL;	68 return NULL;

69 }	69 }

70	70

71 NativeWidget* TestViewsDelegate::CreateNativeWidget(	71 NativeWidget* TestViewsDelegate::CreateNativeWidget(

72 internal::NativeWidgetDelegate* delegate,	72 internal::NativeWidgetDelegate* delegate,

73 gfx::NativeView parent) {	73 gfx::NativeView parent) {

74 #if defined(USE_AURA) && !defined(OS_CHROMEOS)	74 #if defined(USE_AURA) && !defined(OS_CHROMEOS)

75 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kWinAura))	75 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDesktopAura))

76 return new DesktopNativeWidgetAura(delegate);	76 return new DesktopNativeWidgetAura(delegate);

77 #endif	77 #endif

78 return NULL;	78 return NULL;

79 }	79 }

80	80

81 } // namespace views	81 } // namespace views

OLD	NEW