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

Side by Side Diff: ui/aura/test/test_windows.h

Issue 11421006: Desktop aura: Break aura::Window::SetParent in two. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: I think the content_unittests timeout on linux_aura is flake, but try to fix it anyway. Created 8 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
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 #ifndef UI_AURA_TEST_TEST_WINDOWS_H_ 5 #ifndef UI_AURA_TEST_TEST_WINDOWS_H_
6 #define UI_AURA_TEST_TEST_WINDOWS_H_ 6 #define UI_AURA_TEST_TEST_WINDOWS_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "third_party/skia/include/core/SkColor.h" 11 #include "third_party/skia/include/core/SkColor.h"
12 #include "ui/aura/client/window_types.h" 12 #include "ui/aura/client/window_types.h"
13 #include "ui/aura/test/test_window_delegate.h" 13 #include "ui/aura/test/test_window_delegate.h"
14 #include "ui/aura/test/aura_test_base.h" 14 #include "ui/aura/test/aura_test_base.h"
15 15
16 namespace aura { 16 namespace aura {
17 namespace test { 17 namespace test {
18 18
19 Window* CreateTestWindowWithId(int id, Window* parent); 19 Window* CreateTestWindowWithId(int id, Window* parent);
sky 2012/11/21 23:35:59 Please add a comment that these expect a non-null
20 Window* CreateTestWindowWithBounds(const gfx::Rect& bounds, Window* parent); 20 Window* CreateTestWindowWithBounds(const gfx::Rect& bounds, Window* parent);
21 Window* CreateTestWindow(SkColor color, 21 Window* CreateTestWindow(SkColor color,
22 int id, 22 int id,
23 const gfx::Rect& bounds, 23 const gfx::Rect& bounds,
24 Window* parent); 24 Window* parent);
25 Window* CreateTestWindowWithDelegate(WindowDelegate* delegate, 25 Window* CreateTestWindowWithDelegate(WindowDelegate* delegate,
26 int id, 26 int id,
27 const gfx::Rect& bounds, 27 const gfx::Rect& bounds,
28 Window* parent); 28 Window* parent);
29 Window* CreateTestWindowWithDelegateAndType(WindowDelegate* delegate, 29 Window* CreateTestWindowWithDelegateAndType(WindowDelegate* delegate,
30 client::WindowType type, 30 client::WindowType type,
31 int id, 31 int id,
32 const gfx::Rect& bounds, 32 const gfx::Rect& bounds,
33 Window* parent); 33 Window* parent);
34 34
35 // Creates a transient child window of |parent|. 35 // Creates a transient child window of |parent|.
36 Window* CreateTransientChild(int id, Window* parent); 36 Window* CreateTransientChild(int id, Window* parent, RootWindow* context);
sky 2012/11/21 23:35:59 Is this used? I don't see the new implementation w
37 37
38 // Returns true if |upper| is above |lower| in the window stacking order. 38 // Returns true if |upper| is above |lower| in the window stacking order.
39 bool WindowIsAbove(Window* upper, Window* lower); 39 bool WindowIsAbove(Window* upper, Window* lower);
40 40
41 // Returns true if |upper|'s layer is above |lower|'s layer in the layer 41 // Returns true if |upper|'s layer is above |lower|'s layer in the layer
42 // stacking order. 42 // stacking order.
43 bool LayerIsAbove(Window* upper, Window* lower); 43 bool LayerIsAbove(Window* upper, Window* lower);
44 44
45 // Returns a string containing the id of each of the child windows (bottommost 45 // Returns a string containing the id of each of the child windows (bottommost
46 // first) of |parent|. The format of the string is "id1 id2 id...". 46 // first) of |parent|. The format of the string is "id1 id2 id...".
47 std::string ChildWindowIDsAsString(aura::Window* parent); 47 std::string ChildWindowIDsAsString(aura::Window* parent);
48 48
49 } // namespace test 49 } // namespace test
50 } // namespace aura 50 } // namespace aura
51 51
52 #endif // UI_AURA_TEST_TEST_WINDOWS_H_ 52 #endif // UI_AURA_TEST_TEST_WINDOWS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698