Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(27)

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

Issue 8497067: views: Remove the old views/window/ directory and its stubbed files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « views/desktop/desktop_window_view.cc ('k') | views/view_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/combobox_model.h" 11 #include "ui/base/models/combobox_model.h"
12 #include "ui/gfx/rect.h" 12 #include "ui/gfx/rect.h"
13 #include "ui/views/window/non_client_view.h"
13 #include "views/background.h" 14 #include "views/background.h"
14 #include "views/border.h" 15 #include "views/border.h"
15 #include "views/controls/button/checkbox.h" 16 #include "views/controls/button/checkbox.h"
16 #include "views/controls/button/radio_button.h" 17 #include "views/controls/button/radio_button.h"
17 #include "views/controls/combobox/combobox.h" 18 #include "views/controls/combobox/combobox.h"
18 #include "views/controls/combobox/native_combobox_wrapper.h" 19 #include "views/controls/combobox/native_combobox_wrapper.h"
19 #include "views/controls/label.h" 20 #include "views/controls/label.h"
20 #include "views/controls/link.h" 21 #include "views/controls/link.h"
21 #include "views/controls/native/native_view_host.h" 22 #include "views/controls/native/native_view_host.h"
22 #include "views/controls/scroll_view.h" 23 #include "views/controls/scroll_view.h"
23 #include "views/controls/tabbed_pane/native_tabbed_pane_wrapper.h" 24 #include "views/controls/tabbed_pane/native_tabbed_pane_wrapper.h"
24 #include "views/controls/tabbed_pane/tabbed_pane.h" 25 #include "views/controls/tabbed_pane/tabbed_pane.h"
25 #include "views/controls/textfield/textfield.h" 26 #include "views/controls/textfield/textfield.h"
26 #include "views/focus/accelerator_handler.h" 27 #include "views/focus/accelerator_handler.h"
27 #include "views/focus/focus_manager_factory.h" 28 #include "views/focus/focus_manager_factory.h"
28 #include "views/test/views_test_base.h" 29 #include "views/test/views_test_base.h"
29 #include "views/widget/root_view.h" 30 #include "views/widget/root_view.h"
30 #include "views/widget/widget.h" 31 #include "views/widget/widget.h"
31 #include "views/widget/widget_delegate.h" 32 #include "views/widget/widget_delegate.h"
32 #include "views/window/non_client_view.h"
33 33
34 #if defined(OS_LINUX) 34 #if defined(OS_LINUX)
35 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h" 35 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
36 #endif 36 #endif
37 37
38 namespace { 38 namespace {
39 const int kWindowWidth = 600; 39 const int kWindowWidth = 600;
40 const int kWindowHeight = 500; 40 const int kWindowHeight = 500;
41 41
42 int count = 1; 42 int count = 1;
(...skipping 1710 matching lines...) Expand 10 before | Expand all | Expand 10 after
1753 ASSERT_EQ(3, static_cast<int>(dtor_tracker_.size())); 1753 ASSERT_EQ(3, static_cast<int>(dtor_tracker_.size()));
1754 1754
1755 // Focus manager should be the last one to destruct. 1755 // Focus manager should be the last one to destruct.
1756 ASSERT_STREQ("FocusManagerDtorTracked", dtor_tracker_[2].c_str()); 1756 ASSERT_STREQ("FocusManagerDtorTracked", dtor_tracker_[2].c_str());
1757 1757
1758 // Clear window_ so that we don't try to close it again. 1758 // Clear window_ so that we don't try to close it again.
1759 window_ = NULL; 1759 window_ = NULL;
1760 } 1760 }
1761 1761
1762 } // namespace views 1762 } // namespace views
OLDNEW
« no previous file with comments | « views/desktop/desktop_window_view.cc ('k') | views/view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698