Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Side by Side Diff: ui/wm/core/window_modality_controller.cc

Issue 2172363002: Created min size for print preview dialog and modified to allow the Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Various fixes Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/wm/core/window_modality_controller.h" 5 #include "ui/wm/core/window_modality_controller.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 10
11 #include "ui/aura/client/aura_constants.h" 11 #include "ui/aura/client/aura_constants.h"
12 #include "ui/aura/client/capture_client.h" 12 #include "ui/aura/client/capture_client.h"
13 #include "ui/aura/env.h" 13 #include "ui/aura/env.h"
14 #include "ui/aura/window.h" 14 #include "ui/aura/window.h"
15 #include "ui/aura/window_event_dispatcher.h" 15 #include "ui/aura/window_event_dispatcher.h"
16 #include "ui/aura/window_property.h" 16 #include "ui/aura/window_property.h"
17 #include "ui/base/ui_base_types.h" 17 #include "ui/base/ui_base_types.h"
18 #include "ui/events/event.h" 18 #include "ui/events/event.h"
19 #include "ui/events/event_target.h" 19 #include "ui/events/event_target.h"
20 #include "ui/events/gestures/gesture_recognizer.h" 20 #include "ui/events/gestures/gesture_recognizer.h"
21 #include "ui/wm/core/window_animations.h" 21 #include "ui/wm/core/window_animations.h"
22 #include "ui/wm/core/window_util.h" 22 #include "ui/wm/core/window_util.h"
23 23
24 namespace wm { 24 namespace wm {
25 const char kHasIndependentBoundsKey[] = "__INDEPENDENT_BOUNDS__";
25 26
26 // Transient child's modal parent. 27 // Transient child's modal parent.
27 extern const aura::WindowProperty<aura::Window*>* const kModalParentKey; 28 extern const aura::WindowProperty<aura::Window*>* const kModalParentKey;
28 DEFINE_WINDOW_PROPERTY_KEY(aura::Window*, kModalParentKey, NULL); 29 DEFINE_WINDOW_PROPERTY_KEY(aura::Window*, kModalParentKey, NULL);
29 30
30 namespace { 31 namespace {
31 32
32 bool HasAncestor(aura::Window* window, aura::Window* ancestor) { 33 bool HasAncestor(aura::Window* window, aura::Window* ancestor) {
33 if (!window) 34 if (!window)
34 return false; 35 return false;
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 122
122 void WindowModalityController::OnKeyEvent(ui::KeyEvent* event) { 123 void WindowModalityController::OnKeyEvent(ui::KeyEvent* event) {
123 aura::Window* target = static_cast<aura::Window*>(event->target()); 124 aura::Window* target = static_cast<aura::Window*>(event->target());
124 if (GetModalTransient(target)) 125 if (GetModalTransient(target))
125 event->SetHandled(); 126 event->SetHandled();
126 } 127 }
127 128
128 void WindowModalityController::OnMouseEvent(ui::MouseEvent* event) { 129 void WindowModalityController::OnMouseEvent(ui::MouseEvent* event) {
129 aura::Window* target = static_cast<aura::Window*>(event->target()); 130 aura::Window* target = static_cast<aura::Window*>(event->target());
130 if (ProcessLocatedEvent(target, event)) 131 if (ProcessLocatedEvent(target, event))
131 event->SetHandled(); 132 event->SetHandled();
132 } 133 }
133 134
134 void WindowModalityController::OnTouchEvent(ui::TouchEvent* event) { 135 void WindowModalityController::OnTouchEvent(ui::TouchEvent* event) {
135 aura::Window* target = static_cast<aura::Window*>(event->target()); 136 aura::Window* target = static_cast<aura::Window*>(event->target());
136 if (ProcessLocatedEvent(target, event)) 137 if (ProcessLocatedEvent(target, event))
137 event->SetHandled(); 138 event->SetHandled();
138 } 139 }
139 140
140 //////////////////////////////////////////////////////////////////////////////// 141 ////////////////////////////////////////////////////////////////////////////////
141 // WindowModalityController, aura::EnvObserver implementation: 142 // WindowModalityController, aura::EnvObserver implementation:
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 } 208 }
208 209
209 AnimateWindow(modal_transient_child, WINDOW_ANIMATION_TYPE_BOUNCE); 210 AnimateWindow(modal_transient_child, WINDOW_ANIMATION_TYPE_BOUNCE);
210 } 211 }
211 if (event->type() == ui::ET_TOUCH_CANCELLED) 212 if (event->type() == ui::ET_TOUCH_CANCELLED)
212 return false; 213 return false;
213 return !!modal_transient_child; 214 return !!modal_transient_child;
214 } 215 }
215 216
216 } // namespace wm 217 } // namespace wm
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698