ui/views/focus/focus_manager_unittest.cc - Issue 8598031: views: Move widget/ directory to ui/views.

Side by Side Diff: ui/views/focus/focus_manager_unittest.cc

Issue 8598031: views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: reland for real Created 9 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

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 "base/logging.h"	5 #include "base/logging.h"

6 #include "base/string16.h"	6 #include "base/string16.h"

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

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

9 #include "third_party/skia/include/core/SkColor.h"	9 #include "third_party/skia/include/core/SkColor.h"

10 #include "ui/base/keycodes/keyboard_codes.h"	10 #include "ui/base/keycodes/keyboard_codes.h"

11 #include "ui/base/models/accelerator.h"	11 #include "ui/base/models/accelerator.h"

12 #include "ui/base/models/combobox_model.h"	12 #include "ui/base/models/combobox_model.h"

13 #include "ui/gfx/rect.h"	13 #include "ui/gfx/rect.h"

14 #include "ui/views/focus/accelerator_handler.h"	14 #include "ui/views/focus/accelerator_handler.h"

15 #include "ui/views/focus/focus_manager_factory.h"	15 #include "ui/views/focus/focus_manager_factory.h"

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

	17 #include "ui/views/widget/root_view.h"

	18 #include "ui/views/widget/widget.h"

	19 #include "ui/views/widget/widget_delegate.h"

17 #include "ui/views/window/non_client_view.h"	20 #include "ui/views/window/non_client_view.h"

18 #include "views/background.h"	21 #include "views/background.h"

19 #include "views/border.h"	22 #include "views/border.h"

20 #include "views/controls/button/checkbox.h"	23 #include "views/controls/button/checkbox.h"

21 #include "views/controls/button/radio_button.h"	24 #include "views/controls/button/radio_button.h"

22 #include "views/controls/combobox/combobox.h"	25 #include "views/controls/combobox/combobox.h"

23 #include "views/controls/combobox/native_combobox_wrapper.h"	26 #include "views/controls/combobox/native_combobox_wrapper.h"

24 #include "views/controls/label.h"	27 #include "views/controls/label.h"

25 #include "views/controls/link.h"	28 #include "views/controls/link.h"

26 #include "views/controls/native/native_view_host.h"	29 #include "views/controls/native/native_view_host.h"

27 #include "views/controls/scroll_view.h"	30 #include "views/controls/scroll_view.h"

28 #include "views/controls/tabbed_pane/native_tabbed_pane_wrapper.h"	31 #include "views/controls/tabbed_pane/native_tabbed_pane_wrapper.h"

29 #include "views/controls/tabbed_pane/tabbed_pane.h"	32 #include "views/controls/tabbed_pane/tabbed_pane.h"

30 #include "views/controls/textfield/textfield.h"	33 #include "views/controls/textfield/textfield.h"

31 #include "views/widget/root_view.h"

32 #include "views/widget/widget.h"

33 #include "views/widget/widget_delegate.h"

34	34

35 #if defined(OS_LINUX)	35 #if defined(OS_LINUX)

36 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"	36 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"

37 #endif	37 #endif

38	38

39 namespace {	39 namespace {

40 const int kWindowWidth = 600;	40 const int kWindowWidth = 600;

41 const int kWindowHeight = 500;	41 const int kWindowHeight = 500;

42	42

43 int count = 1;	43 int count = 1;

(...skipping 1710 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1754 ASSERT_EQ(3, static_cast<int>(dtor_tracker_.size()));	1754 ASSERT_EQ(3, static_cast<int>(dtor_tracker_.size()));

1755	1755

1756 // Focus manager should be the last one to destruct.	1756 // Focus manager should be the last one to destruct.

1757 ASSERT_STREQ("FocusManagerDtorTracked", dtor_tracker_[2].c_str());	1757 ASSERT_STREQ("FocusManagerDtorTracked", dtor_tracker_[2].c_str());

1758	1758

1759 // Clear window_ so that we don't try to close it again.	1759 // Clear window_ so that we don't try to close it again.

1760 window_ = NULL;	1760 window_ = NULL;

1761 }	1761 }

1762	1762

1763 } // namespace views	1763 } // namespace views

OLD	NEW

« no previous file with comments | « ui/views/focus/focus_manager.cc ('k') | ui/views/ime/input_method_base.cc » ('j') | no next file with comments »