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

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

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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 | « views/focus/focus_manager.h ('k') | views/layout/box_layout.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/string16.h" 8 #include "base/string16.h"
9 #include "base/string_number_conversions.h" 9 #include "base/string_number_conversions.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "gfx/rect.h"
12 #include "third_party/skia/include/core/SkColor.h" 11 #include "third_party/skia/include/core/SkColor.h"
13 #include "ui/base/keycodes/keyboard_codes.h" 12 #include "ui/base/keycodes/keyboard_codes.h"
14 #include "ui/base/models/combobox_model.h" 13 #include "ui/base/models/combobox_model.h"
14 #include "ui/gfx/rect.h"
15 #include "views/background.h" 15 #include "views/background.h"
16 #include "views/border.h" 16 #include "views/border.h"
17 #include "views/controls/button/checkbox.h" 17 #include "views/controls/button/checkbox.h"
18 #include "views/controls/button/native_button.h" 18 #include "views/controls/button/native_button.h"
19 #include "views/controls/button/radio_button.h" 19 #include "views/controls/button/radio_button.h"
20 #include "views/controls/combobox/combobox.h" 20 #include "views/controls/combobox/combobox.h"
21 #include "views/controls/combobox/native_combobox_wrapper.h" 21 #include "views/controls/combobox/native_combobox_wrapper.h"
22 #include "views/controls/label.h" 22 #include "views/controls/label.h"
23 #include "views/controls/link.h" 23 #include "views/controls/link.h"
24 #include "views/controls/native/native_view_host.h" 24 #include "views/controls/native/native_view_host.h"
(...skipping 1696 matching lines...) Expand 10 before | Expand all | Expand 10 after
1721 // Focus manager should be the last one to destruct. 1721 // Focus manager should be the last one to destruct.
1722 ASSERT_STREQ("FocusManagerDtorTracked", dtor_tracker_[2].c_str()); 1722 ASSERT_STREQ("FocusManagerDtorTracked", dtor_tracker_[2].c_str());
1723 1723
1724 // Clear window_ so that we don't try to close it again. 1724 // Clear window_ so that we don't try to close it again.
1725 window_ = NULL; 1725 window_ = NULL;
1726 } 1726 }
1727 1727
1728 #endif // defined(OS_CHROMEOS) 1728 #endif // defined(OS_CHROMEOS)
1729 1729
1730 } // namespace views 1730 } // namespace views
OLDNEW
« no previous file with comments | « views/focus/focus_manager.h ('k') | views/layout/box_layout.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698