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

Side by Side Diff: ui/aura/window.h

Issue 8620002: s/Move/Stack/ in names of stacking-related methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix a test Created 9 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/desktop.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 // Marks the a portion of window as needing to be painted. 121 // Marks the a portion of window as needing to be painted.
122 void SchedulePaintInRect(const gfx::Rect& rect); 122 void SchedulePaintInRect(const gfx::Rect& rect);
123 123
124 // Sets the contents of the window. 124 // Sets the contents of the window.
125 void SetCanvas(const SkCanvas& canvas, const gfx::Point& origin); 125 void SetCanvas(const SkCanvas& canvas, const gfx::Point& origin);
126 126
127 // Sets the parent window of the window. If NULL, the window is parented to 127 // Sets the parent window of the window. If NULL, the window is parented to
128 // the desktop's window. 128 // the desktop's window.
129 void SetParent(Window* parent); 129 void SetParent(Window* parent);
130 130
131 // Move the specified child of this Window to the front of the z-order. 131 // Stacks the specified child of this Window at the front of the z-order.
132 void MoveChildToFront(Window* child); 132 void StackChildAtTop(Window* child);
133 133
134 // Moves |other| to be above |child|. Does nothing if |child| is already above 134 // Stacks |child| above |other|. Does nothing if |child| is already above
135 // |other|. 135 // |other|.
136 void MoveChildAbove(Window* child, Window* other); 136 void StackChildAbove(Window* child, Window* other);
137 137
138 // Returns true if this window can be activated. 138 // Returns true if this window can be activated.
139 bool CanActivate() const; 139 bool CanActivate() const;
140 140
141 // Tree operations. 141 // Tree operations.
142 // TODO(beng): Child windows are currently not owned by the hierarchy. We 142 // TODO(beng): Child windows are currently not owned by the hierarchy. We
143 // should change this. 143 // should change this.
144 void AddChild(Window* child); 144 void AddChild(Window* child);
145 void RemoveChild(Window* child); 145 void RemoveChild(Window* child);
146 146
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 // TODO(oshima): Consolidcate ViewProp and aura::window property 339 // TODO(oshima): Consolidcate ViewProp and aura::window property
340 // implementation. 340 // implementation.
341 std::map<const char*, void*> prop_map_; 341 std::map<const char*, void*> prop_map_;
342 342
343 DISALLOW_COPY_AND_ASSIGN(Window); 343 DISALLOW_COPY_AND_ASSIGN(Window);
344 }; 344 };
345 345
346 } // namespace aura 346 } // namespace aura
347 347
348 #endif // UI_AURA_WINDOW_H_ 348 #endif // UI_AURA_WINDOW_H_
OLDNEW
« no previous file with comments | « ui/aura/desktop.cc ('k') | ui/aura/window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698