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

Side by Side Diff: ui/aura/window.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_WINDOW_H_ 5 #ifndef UI_AURA_WINDOW_H_
6 #define UI_AURA_WINDOW_H_ 6 #define UI_AURA_WINDOW_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 // Returns the target bounds of the window. If the window's layer is 164 // Returns the target bounds of the window. If the window's layer is
165 // not animating, it simply returns the current bounds. 165 // not animating, it simply returns the current bounds.
166 gfx::Rect GetTargetBounds() const; 166 gfx::Rect GetTargetBounds() const;
167 167
168 // Marks the a portion of window as needing to be painted. 168 // Marks the a portion of window as needing to be painted.
169 void SchedulePaintInRect(const gfx::Rect& rect); 169 void SchedulePaintInRect(const gfx::Rect& rect);
170 170
171 // Assigns a new external texture to the window's layer. 171 // Assigns a new external texture to the window's layer.
172 void SetExternalTexture(ui::Texture* texture); 172 void SetExternalTexture(ui::Texture* texture);
173 173
174 // Sets the parent window of the window. If NULL, the window is parented to 174 // Places this window where |target_root| specifies. |target_root| may not be
175 // the root window. 175 // NULL.
176 void SetParent(Window* parent); 176 void SetDefaultParentByTargetRoot(RootWindow* target_root,
sky 2012/11/21 23:35:59 nit: TargetRoot doesn't mean much, how about SetDe
177 const gfx::Rect& bounds);
177 178
178 // Stacks the specified child of this Window at the front of the z-order. 179 // Stacks the specified child of this Window at the front of the z-order.
179 void StackChildAtTop(Window* child); 180 void StackChildAtTop(Window* child);
180 181
181 // Stacks |child| above |target|. Does nothing if |child| is already above 182 // Stacks |child| above |target|. Does nothing if |child| is already above
182 // |target|. Does not stack on top of windows with NULL layer delegates, 183 // |target|. Does not stack on top of windows with NULL layer delegates,
183 // see WindowTest.StackingMadrigal for details. 184 // see WindowTest.StackingMadrigal for details.
184 void StackChildAbove(Window* child, Window* target); 185 void StackChildAbove(Window* child, Window* target);
185 186
186 // Stacks |child| below |target|. Does nothing if |child| is already below 187 // Stacks |child| below |target|. Does nothing if |child| is already below
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 }; 501 };
501 502
502 std::map<const void*, Value> prop_map_; 503 std::map<const void*, Value> prop_map_;
503 504
504 DISALLOW_COPY_AND_ASSIGN(Window); 505 DISALLOW_COPY_AND_ASSIGN(Window);
505 }; 506 };
506 507
507 } // namespace aura 508 } // namespace aura
508 509
509 #endif // UI_AURA_WINDOW_H_ 510 #endif // UI_AURA_WINDOW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698