| OLD | NEW |
| 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 #include "ui/aura/window.h" | 5 #include "ui/aura/window.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| (...skipping 1150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1161 hidden_(0) { | 1161 hidden_(0) { |
| 1162 } | 1162 } |
| 1163 | 1163 |
| 1164 int shown() const { return shown_; } | 1164 int shown() const { return shown_; } |
| 1165 int hidden() const { return hidden_; } | 1165 int hidden() const { return hidden_; } |
| 1166 void Clear() { | 1166 void Clear() { |
| 1167 shown_ = 0; | 1167 shown_ = 0; |
| 1168 hidden_ = 0; | 1168 hidden_ = 0; |
| 1169 } | 1169 } |
| 1170 | 1170 |
| 1171 virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE { | 1171 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE { |
| 1172 if (visible) | 1172 if (visible) |
| 1173 shown_++; | 1173 shown_++; |
| 1174 else | 1174 else |
| 1175 hidden_++; | 1175 hidden_++; |
| 1176 } | 1176 } |
| 1177 | 1177 |
| 1178 private: | 1178 private: |
| 1179 int shown_; | 1179 int shown_; |
| 1180 int hidden_; | 1180 int hidden_; |
| 1181 | 1181 |
| (...skipping 1260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2442 element->Step(start_time + base::TimeDelta::FromMilliseconds(1000)); | 2442 element->Step(start_time + base::TimeDelta::FromMilliseconds(1000)); |
| 2443 | 2443 |
| 2444 // No bounds changed notification at the end of animation since layer | 2444 // No bounds changed notification at the end of animation since layer |
| 2445 // delegate is NULL. | 2445 // delegate is NULL. |
| 2446 EXPECT_FALSE(delegate.bounds_changed()); | 2446 EXPECT_FALSE(delegate.bounds_changed()); |
| 2447 EXPECT_NE("0,0 100x100", window->bounds().ToString()); | 2447 EXPECT_NE("0,0 100x100", window->bounds().ToString()); |
| 2448 } | 2448 } |
| 2449 | 2449 |
| 2450 } // namespace test | 2450 } // namespace test |
| 2451 } // namespace aura | 2451 } // namespace aura |
| OLD | NEW |