| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/views/widget/window_reorderer.h" | 5 #include "ui/views/widget/window_reorderer.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "ui/aura/window.h" | 10 #include "ui/aura/window.h" |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 virtual ~AssociationObserver(); | 64 virtual ~AssociationObserver(); |
| 65 | 65 |
| 66 // Start/stop observing changes in the kHostViewKey property on |window|. | 66 // Start/stop observing changes in the kHostViewKey property on |window|. |
| 67 void StartObserving(aura::Window* window); | 67 void StartObserving(aura::Window* window); |
| 68 void StopObserving(aura::Window* window); | 68 void StopObserving(aura::Window* window); |
| 69 | 69 |
| 70 private: | 70 private: |
| 71 // aura::WindowObserver overrides: | 71 // aura::WindowObserver overrides: |
| 72 virtual void OnWindowPropertyChanged(aura::Window* window, | 72 virtual void OnWindowPropertyChanged(aura::Window* window, |
| 73 const void* key, | 73 const void* key, |
| 74 intptr_t old) OVERRIDE; | 74 intptr_t old) override; |
| 75 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; | 75 virtual void OnWindowDestroying(aura::Window* window) override; |
| 76 | 76 |
| 77 // Not owned. | 77 // Not owned. |
| 78 WindowReorderer* reorderer_; | 78 WindowReorderer* reorderer_; |
| 79 | 79 |
| 80 std::set<aura::Window*> windows_; | 80 std::set<aura::Window*> windows_; |
| 81 | 81 |
| 82 DISALLOW_COPY_AND_ASSIGN(AssociationObserver); | 82 DISALLOW_COPY_AND_ASSIGN(AssociationObserver); |
| 83 }; | 83 }; |
| 84 | 84 |
| 85 WindowReorderer::AssociationObserver::AssociationObserver( | 85 WindowReorderer::AssociationObserver::AssociationObserver( |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 192 association_observer_->StopObserving(window); | 192 association_observer_->StopObserving(window); |
| 193 } | 193 } |
| 194 | 194 |
| 195 void WindowReorderer::OnWindowDestroying(aura::Window* window) { | 195 void WindowReorderer::OnWindowDestroying(aura::Window* window) { |
| 196 parent_window_->RemoveObserver(this); | 196 parent_window_->RemoveObserver(this); |
| 197 parent_window_ = NULL; | 197 parent_window_ = NULL; |
| 198 association_observer_.reset(); | 198 association_observer_.reset(); |
| 199 } | 199 } |
| 200 | 200 |
| 201 } // namespace views | 201 } // namespace views |
| OLD | NEW |