ui/views/widget/native_widget_unittest.cc - Issue 8742030: views: Move view.h to ui/views/.

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/widget/native_widget_unittest.cc

Issue 8742030: views: Move view.h to ui/views/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase and fix conflicts Created 9 years 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/widget/native_widget_test_utils_win.cc ('k') | ui/views/widget/root_view.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 "testing/gtest/include/gtest/gtest.h"	5 #include "testing/gtest/include/gtest/gtest.h"

6 #include "ui/views/controls/native/native_view_host.h"	6 #include "ui/views/controls/native/native_view_host.h"

7 #include "ui/views/test/views_test_base.h"	7 #include "ui/views/test/views_test_base.h"

	8 #include "ui/views/view.h"

8 #include "ui/views/widget/native_widget_private.h"	9 #include "ui/views/widget/native_widget_private.h"

9 #include "ui/views/widget/native_widget_test_utils.h"	10 #include "ui/views/widget/native_widget_test_utils.h"

10 #include "ui/views/widget/widget.h"	11 #include "ui/views/widget/widget.h"

11 #include "views/view.h"

12	12

13 namespace views {	13 namespace views {

14	14

15 class ScopedTestWidget {	15 class ScopedTestWidget {

16 public:	16 public:

17 ScopedTestWidget(internal::NativeWidgetPrivate* native_widget)	17 ScopedTestWidget(internal::NativeWidgetPrivate* native_widget)

18 : native_widget_(native_widget) {	18 : native_widget_(native_widget) {

19 }	19 }

20 ~ScopedTestWidget() {	20 ~ScopedTestWidget() {

21 // \|CloseNow\| deletes both \|native_widget_\| and its associated	21 // \|CloseNow\| deletes both \|native_widget_\| and its associated

(...skipping 52 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
74 internal::NativeWidgetPrivate* child_widget =	74 internal::NativeWidgetPrivate* child_widget =

75 internal::CreateNativeSubWidget();	75 internal::CreateNativeSubWidget();

76 child_host->Attach(child_widget->GetWidget()->GetNativeView());	76 child_host->Attach(child_widget->GetWidget()->GetNativeView());

77	77

78 EXPECT_EQ(toplevel_widget.get(),	78 EXPECT_EQ(toplevel_widget.get(),

79 internal::NativeWidgetPrivate::GetTopLevelNativeWidget(	79 internal::NativeWidgetPrivate::GetTopLevelNativeWidget(

80 child_widget->GetWidget()->GetNativeView()));	80 child_widget->GetWidget()->GetNativeView()));

81 }	81 }

82	82

83 } // namespace views	83 } // namespace views

OLD	NEW