| OLD | NEW |
| 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 #include "ui/aura/window.h" | 5 #include "ui/aura/window.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/stringprintf.h" | 9 #include "base/stringprintf.h" |
| 10 #include "testing/gtest/include/gtest/gtest.h" | 10 #include "testing/gtest/include/gtest/gtest.h" |
| (...skipping 868 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 879 destroyed_count_ = 0; | 879 destroyed_count_ = 0; |
| 880 return result; | 880 return result; |
| 881 } | 881 } |
| 882 | 882 |
| 883 // Return a string representation of the arguments passed in | 883 // Return a string representation of the arguments passed in |
| 884 // OnPropertyChanged callback. | 884 // OnPropertyChanged callback. |
| 885 std::string PropertyChangeInfoAndClear() { | 885 std::string PropertyChangeInfoAndClear() { |
| 886 std::string result( | 886 std::string result( |
| 887 base::StringPrintf("name=%s old=%ld new=%ld", | 887 base::StringPrintf("name=%s old=%ld new=%ld", |
| 888 property_name_.c_str(), | 888 property_name_.c_str(), |
| 889 old_property_value_, | 889 static_cast<long>(old_property_value_), |
| 890 new_property_value_)); | 890 static_cast<long>(new_property_value_))); |
| 891 property_name_.clear(); | 891 property_name_.clear(); |
| 892 old_property_value_ = 0; | 892 old_property_value_ = 0; |
| 893 new_property_value_ = 0; | 893 new_property_value_ = 0; |
| 894 return result; | 894 return result; |
| 895 } | 895 } |
| 896 | 896 |
| 897 private: | 897 private: |
| 898 virtual void OnWindowAdded(Window* new_window) OVERRIDE { | 898 virtual void OnWindowAdded(Window* new_window) OVERRIDE { |
| 899 added_count_++; | 899 added_count_++; |
| 900 } | 900 } |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1080 | 1080 |
| 1081 w3->Activate(); | 1081 w3->Activate(); |
| 1082 EXPECT_EQ(w2.get(), active()); | 1082 EXPECT_EQ(w2.get(), active()); |
| 1083 | 1083 |
| 1084 w1->Activate(); | 1084 w1->Activate(); |
| 1085 EXPECT_EQ(w1.get(), active()); | 1085 EXPECT_EQ(w1.get(), active()); |
| 1086 } | 1086 } |
| 1087 | 1087 |
| 1088 } // namespace test | 1088 } // namespace test |
| 1089 } // namespace aura | 1089 } // namespace aura |
| OLD | NEW |