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 1139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1150 hidden_(0) { | 1150 hidden_(0) { |
1151 } | 1151 } |
1152 | 1152 |
1153 int shown() const { return shown_; } | 1153 int shown() const { return shown_; } |
1154 int hidden() const { return hidden_; } | 1154 int hidden() const { return hidden_; } |
1155 void Clear() { | 1155 void Clear() { |
1156 shown_ = 0; | 1156 shown_ = 0; |
1157 hidden_ = 0; | 1157 hidden_ = 0; |
1158 } | 1158 } |
1159 | 1159 |
1160 virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE { | 1160 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE { |
1161 if (visible) | 1161 if (visible) |
1162 shown_++; | 1162 shown_++; |
1163 else | 1163 else |
1164 hidden_++; | 1164 hidden_++; |
1165 } | 1165 } |
1166 | 1166 |
1167 private: | 1167 private: |
1168 int shown_; | 1168 int shown_; |
1169 int hidden_; | 1169 int hidden_; |
1170 | 1170 |
(...skipping 1260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2431 element->Step(start_time + base::TimeDelta::FromMilliseconds(1000)); | 2431 element->Step(start_time + base::TimeDelta::FromMilliseconds(1000)); |
2432 | 2432 |
2433 // No bounds changed notification at the end of animation since layer | 2433 // No bounds changed notification at the end of animation since layer |
2434 // delegate is NULL. | 2434 // delegate is NULL. |
2435 EXPECT_FALSE(delegate.bounds_changed()); | 2435 EXPECT_FALSE(delegate.bounds_changed()); |
2436 EXPECT_NE("0,0 100x100", window->bounds().ToString()); | 2436 EXPECT_NE("0,0 100x100", window->bounds().ToString()); |
2437 } | 2437 } |
2438 | 2438 |
2439 } // namespace test | 2439 } // namespace test |
2440 } // namespace aura | 2440 } // namespace aura |
OLD | NEW |