| 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 <string> | 7 #include <string> |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 1939 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1950 virtual void OnWindowVisibilityChanged(Window* window, | 1950 virtual void OnWindowVisibilityChanged(Window* window, |
| 1951 bool visible) OVERRIDE { | 1951 bool visible) OVERRIDE { |
| 1952 visibility_info_.reset(new VisibilityInfo); | 1952 visibility_info_.reset(new VisibilityInfo); |
| 1953 visibility_info_->window_visible = window->IsVisible(); | 1953 visibility_info_->window_visible = window->IsVisible(); |
| 1954 visibility_info_->visible_param = visible; | 1954 visibility_info_->visible_param = visible; |
| 1955 } | 1955 } |
| 1956 | 1956 |
| 1957 virtual void OnWindowDestroyed(Window* window) OVERRIDE { | 1957 virtual void OnWindowDestroyed(Window* window) OVERRIDE { |
| 1958 EXPECT_FALSE(window->parent()); | 1958 EXPECT_FALSE(window->parent()); |
| 1959 destroyed_count_++; | 1959 destroyed_count_++; |
| 1960 aura::WindowObserver::OnWindowDestroyed(window); |
| 1960 } | 1961 } |
| 1961 | 1962 |
| 1962 virtual void OnWindowPropertyChanged(Window* window, | 1963 virtual void OnWindowPropertyChanged(Window* window, |
| 1963 const void* key, | 1964 const void* key, |
| 1964 intptr_t old) OVERRIDE { | 1965 intptr_t old) OVERRIDE { |
| 1965 property_key_ = key; | 1966 property_key_ = key; |
| 1966 old_property_value_ = old; | 1967 old_property_value_ = old; |
| 1967 } | 1968 } |
| 1968 | 1969 |
| 1969 int added_count_; | 1970 int added_count_; |
| (...skipping 1391 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3361 | 3362 |
| 3362 w111->SetBounds(gfx::Rect(7, 8, 11, 12)); | 3363 w111->SetBounds(gfx::Rect(7, 8, 11, 12)); |
| 3363 EXPECT_EQ("7,8 11x12", w111->bounds().ToString()); | 3364 EXPECT_EQ("7,8 11x12", w111->bounds().ToString()); |
| 3364 EXPECT_EQ("7,8 11x12", w111->layer()->bounds().ToString()); | 3365 EXPECT_EQ("7,8 11x12", w111->layer()->bounds().ToString()); |
| 3365 | 3366 |
| 3366 delete w1ll; | 3367 delete w1ll; |
| 3367 } | 3368 } |
| 3368 | 3369 |
| 3369 } // namespace test | 3370 } // namespace test |
| 3370 } // namespace aura | 3371 } // namespace aura |
| OLD | NEW |