ui/views/test/desktop_test_views_delegate.cc - Issue 11369220: Move the desktop aura classes into a desktop subdir to make the gyp simpler.

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

Issue 11369220: Move the desktop aura classes into a desktop subdir to make the gyp simpler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 1 month 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 | « ui/views/examples/examples_window_with_content.cc ('k') | ui/views/test/test_views_delegate.cc » ('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/desktop_test_views_delegate.h"	5 #include "ui/views/test/desktop_test_views_delegate.h"

6	6

7 #include "ui/views/widget/desktop_native_widget_aura.h"	7 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"

8 #include "ui/views/widget/native_widget_aura.h"	8 #include "ui/views/widget/native_widget_aura.h"

9	9

10 namespace views {	10 namespace views {

11	11

12 DesktopTestViewsDelegate::DesktopTestViewsDelegate() {}	12 DesktopTestViewsDelegate::DesktopTestViewsDelegate() {}

13	13

14 DesktopTestViewsDelegate::~DesktopTestViewsDelegate() {}	14 DesktopTestViewsDelegate::~DesktopTestViewsDelegate() {}

15	15

16 NativeWidget* DesktopTestViewsDelegate::CreateNativeWidget(	16 NativeWidget* DesktopTestViewsDelegate::CreateNativeWidget(

17 Widget::InitParams::Type type,	17 Widget::InitParams::Type type,

18 internal::NativeWidgetDelegate* delegate,	18 internal::NativeWidgetDelegate* delegate,

19 gfx::NativeView parent) {	19 gfx::NativeView parent) {

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

21 if (parent && type != views::Widget::InitParams::TYPE_MENU)	21 if (parent && type != views::Widget::InitParams::TYPE_MENU)

22 return new views::NativeWidgetAura(delegate);	22 return new views::NativeWidgetAura(delegate);

23	23

24 if (!parent)	24 if (!parent)

25 return new views::DesktopNativeWidgetAura(delegate);	25 return new views::DesktopNativeWidgetAura(delegate);

26 #endif	26 #endif

27	27

28 return NULL;	28 return NULL;

29 }	29 }

30	30

31 } // namespace views	31 } // namespace views

OLD	NEW