summaryrefslogtreecommitdiffstats
path: root/ash/wm/window_modality_controller.h
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-02 00:00:23 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-02 00:00:23 +0000
commit0c2dc0166fd24ae0ede00035a95a7dbfe2777b72 (patch)
tree69584fc9b2e99be226ea53ee7f7a0176be439e7c /ash/wm/window_modality_controller.h
parentdf2d1010ff9843074a84d33830a40d628c271bc2 (diff)
downloadchromium_src-0c2dc0166fd24ae0ede00035a95a7dbfe2777b72.zip
chromium_src-0c2dc0166fd24ae0ede00035a95a7dbfe2777b72.tar.gz
chromium_src-0c2dc0166fd24ae0ede00035a95a7dbfe2777b72.tar.bz2
Move WindowModalityController to CoreWm.
I left the unittest in ash still for the time being as it requires a bunch of stuff from ash too (mostly the activation logic which is still in progress for Corewm). http://crbug.com/162100 R=rouslan@chromium.org Review URL: https://codereview.chromium.org/11316287 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170679 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/window_modality_controller.h')
-rw-r--r--ash/wm/window_modality_controller.h68
1 files changed, 0 insertions, 68 deletions
diff --git a/ash/wm/window_modality_controller.h b/ash/wm/window_modality_controller.h
deleted file mode 100644
index c55b990..0000000
--- a/ash/wm/window_modality_controller.h
+++ /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.
-
-#ifndef ASH_WM_WINDOW_MODALITY_CONTROLLER_H_
-#define ASH_WM_WINDOW_MODALITY_CONTROLLER_H_
-
-#include <vector>
-
-#include "ash/ash_export.h"
-#include "base/compiler_specific.h"
-#include "ui/aura/env_observer.h"
-#include "ui/aura/window_observer.h"
-#include "ui/base/events/event_handler.h"
-
-namespace ui {
-class LocatedEvent;
-}
-
-namespace ash {
-
-// Sets the modal parent for the child.
-ASH_EXPORT void SetModalParent(aura::Window* child, aura::Window* parent);
-
-// Returns the modal transient child of |window|, or NULL if |window| does not
-// have any modal transient children.
-ASH_EXPORT aura::Window* GetModalTransient(aura::Window* window);
-
-namespace internal {
-
-// WindowModalityController is an event filter that consumes events sent to
-// windows that are the transient parents of window-modal windows. This filter
-// must be added to the CompoundEventFilter so that activation works properly.
-class WindowModalityController : public ui::EventHandler,
- public aura::EnvObserver,
- public aura::WindowObserver {
- public:
- WindowModalityController();
- virtual ~WindowModalityController();
-
- // Overridden from ui::EventHandler:
- virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
- virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
- virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
-
- // Overridden from aura::EnvObserver:
- virtual void OnWindowInitialized(aura::Window* window) OVERRIDE;
-
- // Overridden from aura::WindowObserver:
- virtual void OnWindowVisibilityChanged(aura::Window* window,
- bool visible) OVERRIDE;
- virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;
-
- private:
- // Processes a mouse/touch event, and returns true if the event should be
- // consumed.
- bool ProcessLocatedEvent(aura::Window* target,
- ui::LocatedEvent* event);
-
- std::vector<aura::Window*> windows_;
-
- DISALLOW_COPY_AND_ASSIGN(WindowModalityController);
-};
-
-} // namespace internal
-} // namespace ash
-
-#endif // ASH_WM_WINDOW_MODALITY_CONTROLLER_H_