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

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: Fix ash_unittests 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
« no previous file with comments | « ui/aura/test/test_windows.cc ('k') | ui/aura/window.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) 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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 // Returns the target bounds of the window. If the window's layer is 163 // Returns the target bounds of the window. If the window's layer is
164 // not animating, it simply returns the current bounds. 164 // not animating, it simply returns the current bounds.
165 gfx::Rect GetTargetBounds() const; 165 gfx::Rect GetTargetBounds() const;
166 166
167 // Marks the a portion of window as needing to be painted. 167 // Marks the a portion of window as needing to be painted.
168 void SchedulePaintInRect(const gfx::Rect& rect); 168 void SchedulePaintInRect(const gfx::Rect& rect);
169 169
170 // Assigns a new external texture to the window's layer. 170 // Assigns a new external texture to the window's layer.
171 void SetExternalTexture(ui::Texture* texture); 171 void SetExternalTexture(ui::Texture* texture);
172 172
173 // Sets the parent window of the window. If NULL, the window is parented to 173 // Places this window per |root_window|'s stacking client. The final location
174 // the root window. 174 // may be a RootWindow other than the one passed in. |root_window| may not be
175 void SetParent(Window* parent); 175 // NULL. |bounds_in_screen| may be empty; it is more optional context that
176 // may, but isn't necessarily used.
177 void SetDefaultParentByRootWindow(RootWindow* root_window,
178 const gfx::Rect& bounds_in_screen);
176 179
177 // Stacks the specified child of this Window at the front of the z-order. 180 // Stacks the specified child of this Window at the front of the z-order.
178 void StackChildAtTop(Window* child); 181 void StackChildAtTop(Window* child);
179 182
180 // Stacks |child| above |target|. Does nothing if |child| is already above 183 // Stacks |child| above |target|. Does nothing if |child| is already above
181 // |target|. Does not stack on top of windows with NULL layer delegates, 184 // |target|. Does not stack on top of windows with NULL layer delegates,
182 // see WindowTest.StackingMadrigal for details. 185 // see WindowTest.StackingMadrigal for details.
183 void StackChildAbove(Window* child, Window* target); 186 void StackChildAbove(Window* child, Window* target);
184 187
185 // Stacks |child| below |target|. Does nothing if |child| is already below 188 // Stacks |child| below |target|. Does nothing if |child| is already below
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 }; 497 };
495 498
496 std::map<const void*, Value> prop_map_; 499 std::map<const void*, Value> prop_map_;
497 500
498 DISALLOW_COPY_AND_ASSIGN(Window); 501 DISALLOW_COPY_AND_ASSIGN(Window);
499 }; 502 };
500 503
501 } // namespace aura 504 } // namespace aura
502 505
503 #endif // UI_AURA_WINDOW_H_ 506 #endif // UI_AURA_WINDOW_H_
OLDNEW
« no previous file with comments | « ui/aura/test/test_windows.cc ('k') | ui/aura/window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698