| Index: ui/views/controls/menu/display_change_listener_aura.cc
|
| diff --git a/ui/views/controls/menu/display_change_listener_aura.cc b/ui/views/controls/menu/display_change_listener_aura.cc
|
| deleted file mode 100644
|
| index 7bab443909dbfc391372a6fc97c03821c69330cd..0000000000000000000000000000000000000000
|
| --- a/ui/views/controls/menu/display_change_listener_aura.cc
|
| +++ /dev/null
|
| @@ -1,68 +0,0 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#include "ui/aura/window.h"
|
| -#include "ui/aura/window_observer.h"
|
| -#include "ui/views/controls/menu/menu_runner.h"
|
| -#include "ui/views/widget/widget.h"
|
| -
|
| -namespace views {
|
| -namespace internal {
|
| -
|
| -// DisplayChangeListener implementation for aura. Cancels the menu any time the
|
| -// root window bounds change.
|
| -class AuraDisplayChangeListener
|
| - : public DisplayChangeListener,
|
| - public aura::WindowObserver {
|
| - public:
|
| - AuraDisplayChangeListener(Widget* widget, MenuRunner* menu_runner);
|
| - virtual ~AuraDisplayChangeListener();
|
| -
|
| - // aura::WindowObserver overrides:
|
| - virtual void OnWindowBoundsChanged(aura::Window* window,
|
| - const gfx::Rect& old_bounds,
|
| - const gfx::Rect& new_bounds) override;
|
| - virtual void OnWindowDestroying(aura::Window* window) override;
|
| -
|
| - private:
|
| - MenuRunner* menu_runner_;
|
| - aura::Window* root_window_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(AuraDisplayChangeListener);
|
| -};
|
| -
|
| -AuraDisplayChangeListener::AuraDisplayChangeListener(Widget* widget,
|
| - MenuRunner* menu_runner)
|
| - : menu_runner_(menu_runner),
|
| - root_window_(widget->GetNativeView()->GetRootWindow()) {
|
| - if (root_window_)
|
| - root_window_->AddObserver(this);
|
| -}
|
| -
|
| -AuraDisplayChangeListener::~AuraDisplayChangeListener() {
|
| - if (root_window_)
|
| - root_window_->RemoveObserver(this);
|
| -}
|
| -
|
| -void AuraDisplayChangeListener::OnWindowBoundsChanged(
|
| - aura::Window* window,
|
| - const gfx::Rect& old_bounds,
|
| - const gfx::Rect& new_bounds) {
|
| - menu_runner_->Cancel();
|
| -}
|
| -
|
| -void AuraDisplayChangeListener::OnWindowDestroying(aura::Window* window) {
|
| - DCHECK_EQ(window, root_window_);
|
| - root_window_->RemoveObserver(this);
|
| - root_window_ = NULL;
|
| -}
|
| -
|
| -// static
|
| -DisplayChangeListener* DisplayChangeListener::Create(Widget* widget,
|
| - MenuRunner* runner) {
|
| - return new AuraDisplayChangeListener(widget, runner);
|
| -}
|
| -
|
| -} // namespace internal
|
| -} // namespace views
|
|
|