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

Unified Diff: ui/aura/window.cc

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, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura/window.h ('k') | ui/aura/window_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/window.cc
diff --git a/ui/aura/window.cc b/ui/aura/window.cc
index 334605ceef0f806a8e570b11708ae533cdf84363..9de6ff9ac47b688bf4029cd4357fa93a15dba1b2 100644
--- a/ui/aura/window.cc
+++ b/ui/aura/window.cc
@@ -183,13 +183,13 @@ void Window::SetParent(Window* parent) {
NOTREACHED();
}
-void Window::MoveChildToFront(Window* child) {
+void Window::StackChildAtTop(Window* child) {
if (children_.size() <= 1 || child == children_.back())
return; // In the front already.
- MoveChildAbove(child, children_.back());
+ StackChildAbove(child, children_.back());
}
-void Window::MoveChildAbove(Window* child, Window* other) {
+void Window::StackChildAbove(Window* child, Window* other) {
DCHECK_NE(child, other);
DCHECK(child);
DCHECK(other);
@@ -208,16 +208,16 @@ void Window::MoveChildAbove(Window* child, Window* other) {
children_.insert(children_.begin() + other_i, child);
// Reorder the layer.
- layer()->MoveAbove(child->layer(), other->layer());
+ layer()->StackAbove(child->layer(), other->layer());
- // Move any transient children that share the same parent to be in front of
+ // Stack any transient children that share the same parent to be in front of
// 'child'.
Window* last_transient = child;
for (Windows::iterator i = child->transient_children_.begin();
i != child->transient_children_.end(); ++i) {
Window* transient_child = *i;
if (transient_child->parent_ == this) {
- MoveChildAbove(transient_child, last_transient);
+ StackChildAbove(transient_child, last_transient);
last_transient = transient_child;
}
}
« no previous file with comments | « ui/aura/window.h ('k') | ui/aura/window_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698