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/app_types.h" | 8 #include "ash/public/cpp/app_types.h" |
9 #include "ash/public/cpp/shell_window_ids.h" | 9 #include "ash/public/cpp/shell_window_ids.h" |
10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
133 container_->StackChildAbove(backdrop_window_, window); | 133 container_->StackChildAbove(backdrop_window_, window); |
134 container_->StackChildAbove(window, backdrop_window_); | 134 container_->StackChildAbove(window, backdrop_window_); |
135 } | 135 } |
136 | 136 |
137 void BackdropController::OnOverviewModeStarting() { | 137 void BackdropController::OnOverviewModeStarting() { |
138 force_hidden_ = true; | 138 force_hidden_ = true; |
139 Hide(); | 139 Hide(); |
140 } | 140 } |
141 | 141 |
142 void BackdropController::OnOverviewModeEnded() { | 142 void BackdropController::OnOverviewModeEnded() { |
| 143 if (Shell::Get()->IsSplitViewModeActive()) |
| 144 return; |
| 145 |
143 force_hidden_ = false; | 146 force_hidden_ = false; |
144 UpdateBackdrop(); | 147 UpdateBackdrop(); |
145 } | 148 } |
| 149 |
| 150 void BackdropController::OnSplitViewModeStarting() { |
| 151 force_hidden_ = true; |
| 152 Hide(); |
| 153 } |
| 154 |
| 155 void BackdropController::OnSplitViewModeEnded() { |
| 156 force_hidden_ = false; |
| 157 UpdateBackdrop(); |
| 158 } |
146 | 159 |
147 void BackdropController::OnAccessibilityModeChanged( | 160 void BackdropController::OnAccessibilityModeChanged( |
148 AccessibilityNotificationVisibility notify) { | 161 AccessibilityNotificationVisibility notify) { |
149 UpdateBackdrop(); | 162 UpdateBackdrop(); |
150 } | 163 } |
151 | 164 |
152 void BackdropController::EnsureBackdropWidget() { | 165 void BackdropController::EnsureBackdropWidget() { |
153 if (backdrop_) | 166 if (backdrop_) |
154 return; | 167 return; |
155 | 168 |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
231 if (!backdrop_) | 244 if (!backdrop_) |
232 return; | 245 return; |
233 backdrop_->Close(); | 246 backdrop_->Close(); |
234 backdrop_ = nullptr; | 247 backdrop_ = nullptr; |
235 backdrop_window_ = nullptr; | 248 backdrop_window_ = nullptr; |
236 original_event_handler_ = nullptr; | 249 original_event_handler_ = nullptr; |
237 backdrop_event_handler_.reset(); | 250 backdrop_event_handler_.reset(); |
238 } | 251 } |
239 | 252 |
240 } // namespace ash | 253 } // namespace ash |
OLD | NEW |