| 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 #include "ui/aura/window_observer.h" | 6 #include "ui/aura/window_observer.h" |
| 7 #include "ui/views/controls/menu/menu_runner.h" | 7 #include "ui/views/controls/menu/menu_runner.h" |
| 8 #include "ui/views/widget/widget.h" | 8 #include "ui/views/widget/widget.h" |
| 9 | 9 |
| 10 namespace views { | 10 namespace views { |
| 11 namespace internal { | 11 namespace internal { |
| 12 | 12 |
| 13 // DisplayChangeListener implementation for aura. Cancels the menu any time the | 13 // DisplayChangeListener implementation for aura. Cancels the menu any time the |
| 14 // root window bounds change. | 14 // root window bounds change. |
| 15 class AuraDisplayChangeListener | 15 class AuraDisplayChangeListener |
| 16 : public DisplayChangeListener, | 16 : public DisplayChangeListener, |
| 17 public aura::WindowObserver { | 17 public aura::WindowObserver { |
| 18 public: | 18 public: |
| 19 AuraDisplayChangeListener(Widget* widget, MenuRunner* menu_runner); | 19 AuraDisplayChangeListener(Widget* widget, MenuRunner* menu_runner); |
| 20 virtual ~AuraDisplayChangeListener(); | 20 virtual ~AuraDisplayChangeListener(); |
| 21 | 21 |
| 22 // aura::WindowObserver overrides: | 22 // aura::WindowObserver overrides: |
| 23 virtual void OnWindowBoundsChanged(aura::Window* window, | 23 virtual void OnWindowBoundsChanged(aura::Window* window, |
| 24 const gfx::Rect& old_bounds, | 24 const gfx::Rect& old_bounds, |
| 25 const gfx::Rect& new_bounds) OVERRIDE; | 25 const gfx::Rect& new_bounds) override; |
| 26 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; | 26 virtual void OnWindowDestroying(aura::Window* window) override; |
| 27 | 27 |
| 28 private: | 28 private: |
| 29 MenuRunner* menu_runner_; | 29 MenuRunner* menu_runner_; |
| 30 aura::Window* root_window_; | 30 aura::Window* root_window_; |
| 31 | 31 |
| 32 DISALLOW_COPY_AND_ASSIGN(AuraDisplayChangeListener); | 32 DISALLOW_COPY_AND_ASSIGN(AuraDisplayChangeListener); |
| 33 }; | 33 }; |
| 34 | 34 |
| 35 AuraDisplayChangeListener::AuraDisplayChangeListener(Widget* widget, | 35 AuraDisplayChangeListener::AuraDisplayChangeListener(Widget* widget, |
| 36 MenuRunner* menu_runner) | 36 MenuRunner* menu_runner) |
| (...skipping 22 matching lines...) Expand all Loading... |
| 59 } | 59 } |
| 60 | 60 |
| 61 // static | 61 // static |
| 62 DisplayChangeListener* DisplayChangeListener::Create(Widget* widget, | 62 DisplayChangeListener* DisplayChangeListener::Create(Widget* widget, |
| 63 MenuRunner* runner) { | 63 MenuRunner* runner) { |
| 64 return new AuraDisplayChangeListener(widget, runner); | 64 return new AuraDisplayChangeListener(widget, runner); |
| 65 } | 65 } |
| 66 | 66 |
| 67 } // namespace internal | 67 } // namespace internal |
| 68 } // namespace views | 68 } // namespace views |
| OLD | NEW |