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

Unified Diff: ui/wm/core/focus_controller_unittest.cc

Issue 180273025: Keep dedicated layers for hiding animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months 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/wm/core/focus_controller.cc ('k') | ui/wm/core/visibility_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/wm/core/focus_controller_unittest.cc
diff --git a/ui/wm/core/focus_controller_unittest.cc b/ui/wm/core/focus_controller_unittest.cc
index aa1dac75b72546f0fbb366096b78589885575eaa..8a0ba2973ab4df05c866404f3fb82d4e0b5ec31f 100644
--- a/ui/wm/core/focus_controller_unittest.cc
+++ b/ui/wm/core/focus_controller_unittest.cc
@@ -1005,24 +1005,6 @@ class FocusControllerHideTest : public FocusControllerImplicitTestBase {
virtual void ChangeWindowDisposition(aura::Window* window) OVERRIDE {
GetDispositionWindow(window)->Hide();
}
- virtual void PostDispostionChangeExpectations() OVERRIDE {
- // BasicActivation() starts with the stacking order: 1, 2, 3 (3 topmost)
- // and then activates 2. After 2 is hidden in ChangeWindowDisposition
- // above, 3 is activated, but code in
- // FocusController::OnWindowVisibilityChanging keeps 2's layer above 3's
- // until a hide animation completes (e.g. a fade-out transition).
- aura::Window* w2 = root_window()->GetChildById(2);
- aura::Window* w3 = root_window()->GetChildById(3);
-
- // W2 was hidden, but its layer should still be stacked above W3's.
- typedef std::vector<ui::Layer*> Layers;
- const Layers& children = w3->parent()->layer()->children();
- Layers::const_iterator w3_iter =
- std::find(children.begin(), children.end(), w3->layer());
- Layers::const_iterator w2_iter =
- std::find(children.begin(), children.end(), w2->layer());
- EXPECT_TRUE(w2_iter > w3_iter);
- }
private:
DISALLOW_COPY_AND_ASSIGN(FocusControllerHideTest);
« no previous file with comments | « ui/wm/core/focus_controller.cc ('k') | ui/wm/core/visibility_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698