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

Side by Side Diff: ui/views/view_unittest.cc

Issue 194843004: Move files from ui/views/corewm to ui/wm/core (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 9 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 | « ui/views/touchui/touch_selection_controller_impl.cc ('k') | ui/views/views.gyp » ('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) 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 <map> 5 #include <map>
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/rand_util.h" 8 #include "base/rand_util.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 12 matching lines...) Expand all
23 #include "ui/events/event.h" 23 #include "ui/events/event.h"
24 #include "ui/events/gestures/gesture_recognizer.h" 24 #include "ui/events/gestures/gesture_recognizer.h"
25 #include "ui/events/keycodes/keyboard_codes.h" 25 #include "ui/events/keycodes/keyboard_codes.h"
26 #include "ui/gfx/canvas.h" 26 #include "ui/gfx/canvas.h"
27 #include "ui/gfx/path.h" 27 #include "ui/gfx/path.h"
28 #include "ui/gfx/transform.h" 28 #include "ui/gfx/transform.h"
29 #include "ui/views/background.h" 29 #include "ui/views/background.h"
30 #include "ui/views/controls/native/native_view_host.h" 30 #include "ui/views/controls/native/native_view_host.h"
31 #include "ui/views/controls/scroll_view.h" 31 #include "ui/views/controls/scroll_view.h"
32 #include "ui/views/controls/textfield/textfield.h" 32 #include "ui/views/controls/textfield/textfield.h"
33 #include "ui/views/corewm/window_util.h"
34 #include "ui/views/focus/view_storage.h" 33 #include "ui/views/focus/view_storage.h"
35 #include "ui/views/test/views_test_base.h" 34 #include "ui/views/test/views_test_base.h"
36 #include "ui/views/view.h" 35 #include "ui/views/view.h"
37 #include "ui/views/view_constants_aura.h" 36 #include "ui/views/view_constants_aura.h"
38 #include "ui/views/views_delegate.h" 37 #include "ui/views/views_delegate.h"
39 #include "ui/views/widget/native_widget.h" 38 #include "ui/views/widget/native_widget.h"
40 #include "ui/views/widget/root_view.h" 39 #include "ui/views/widget/root_view.h"
41 #include "ui/views/window/dialog_client_view.h" 40 #include "ui/views/window/dialog_client_view.h"
42 #include "ui/views/window/dialog_delegate.h" 41 #include "ui/views/window/dialog_delegate.h"
42 #include "ui/wm/core/window_util.h"
43 43
44 #if defined(OS_WIN) 44 #if defined(OS_WIN)
45 #include "ui/views/test/test_views_delegate.h" 45 #include "ui/views/test/test_views_delegate.h"
46 #endif 46 #endif
47 47
48 using base::ASCIIToUTF16; 48 using base::ASCIIToUTF16;
49 49
50 namespace { 50 namespace {
51 51
52 // Returns true if |ancestor| is an ancestor of |layer|. 52 // Returns true if |ancestor| is an ancestor of |layer|.
(...skipping 3637 matching lines...) Expand 10 before | Expand all | Expand 10 after
3690 ASSERT_EQ("v5", ui::test::ChildLayerNamesAsString(*w2_layer)); 3690 ASSERT_EQ("v5", ui::test::ChildLayerNamesAsString(*w2_layer));
3691 v5_layer = w2_layer->children()[0]; 3691 v5_layer = w2_layer->children()[0];
3692 ASSERT_EQ("v6", ui::test::ChildLayerNamesAsString(*v5_layer)); 3692 ASSERT_EQ("v6", ui::test::ChildLayerNamesAsString(*v5_layer));
3693 3693
3694 } 3694 }
3695 // The views and the widgets are destroyed when AuraTestHelper::TearDown() 3695 // The views and the widgets are destroyed when AuraTestHelper::TearDown()
3696 // destroys root_window(). 3696 // destroys root_window().
3697 } 3697 }
3698 3698
3699 } // namespace views 3699 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/touchui/touch_selection_controller_impl.cc ('k') | ui/views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698