OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "ash/wm/workspace/backdrop_controller.h" | 5 #include "ash/wm/workspace/backdrop_controller.h" |
6 | 6 |
7 #include "ash/accessibility_delegate.h" | 7 #include "ash/accessibility_delegate.h" |
8 #include "ash/public/cpp/shell_window_ids.h" | 8 #include "ash/public/cpp/shell_window_ids.h" |
9 #include "ash/root_window_controller.h" | 9 #include "ash/root_window_controller.h" |
10 #include "ash/shared/app_types.h" | 10 #include "ash/shared/app_types.h" |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
134 container_->StackChildAbove(backdrop_window_, window); | 134 container_->StackChildAbove(backdrop_window_, window); |
135 container_->StackChildAbove(window, backdrop_window_); | 135 container_->StackChildAbove(window, backdrop_window_); |
136 } | 136 } |
137 | 137 |
138 void BackdropController::OnOverviewModeStarting() { | 138 void BackdropController::OnOverviewModeStarting() { |
139 force_hidden_ = true; | 139 force_hidden_ = true; |
140 Hide(); | 140 Hide(); |
141 } | 141 } |
142 | 142 |
143 void BackdropController::OnOverviewModeEnded() { | 143 void BackdropController::OnOverviewModeEnded() { |
144 if (Shell::Get()->IsSplitViewModeActive()) | |
145 return; | |
146 | |
144 force_hidden_ = false; | 147 force_hidden_ = false; |
145 UpdateBackdrop(); | 148 UpdateBackdrop(); |
146 } | 149 } |
150 | |
151 void BackdropController::OnSplitViewModeStarting() { | |
152 force_hidden_ = true; | |
153 Hide(); | |
154 } | |
155 | |
156 void BackdropController::OnSplitViewModeEnded() { | |
157 force_hidden_ = false; | |
oshima
2017/06/14 05:45:47
what happen if I close the snapped window while th
xdai1
2017/06/15 22:11:42
I didn't handle it in the previous patch. Handled
| |
158 UpdateBackdrop(); | |
159 } | |
147 | 160 |
148 void BackdropController::OnAccessibilityModeChanged( | 161 void BackdropController::OnAccessibilityModeChanged( |
149 AccessibilityNotificationVisibility notify) { | 162 AccessibilityNotificationVisibility notify) { |
150 UpdateBackdrop(); | 163 UpdateBackdrop(); |
151 } | 164 } |
152 | 165 |
153 void BackdropController::EnsureBackdropWidget() { | 166 void BackdropController::EnsureBackdropWidget() { |
154 if (backdrop_) | 167 if (backdrop_) |
155 return; | 168 return; |
156 | 169 |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
234 if (!backdrop_) | 247 if (!backdrop_) |
235 return; | 248 return; |
236 backdrop_->Close(); | 249 backdrop_->Close(); |
237 backdrop_ = nullptr; | 250 backdrop_ = nullptr; |
238 backdrop_window_ = nullptr; | 251 backdrop_window_ = nullptr; |
239 original_event_handler_ = nullptr; | 252 original_event_handler_ = nullptr; |
240 backdrop_event_handler_.reset(); | 253 backdrop_event_handler_.reset(); |
241 } | 254 } |
242 | 255 |
243 } // namespace ash | 256 } // namespace ash |
OLD | NEW |