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

Side by Side Diff: ash/wm/workspace/backdrop_controller.cc

Issue 2908793002: [mus+ash] Removes WmWindow from ash/wm/overview and ash/wm/workspace (Closed)
Patch Set: Created 3 years, 7 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
« no previous file with comments | « ash/wm/window_util.cc ('k') | ash/wm/workspace/multi_window_resize_controller_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "ash/system/tray/system_tray_notifier.h" 12 #include "ash/system/tray/system_tray_notifier.h"
13 #include "ash/wm/window_util.h" 13 #include "ash/wm/window_util.h"
14 #include "ash/wm/workspace/backdrop_delegate.h" 14 #include "ash/wm/workspace/backdrop_delegate.h"
15 #include "ash/wm_window.h"
16 #include "base/auto_reset.h" 15 #include "base/auto_reset.h"
17 #include "chromeos/audio/chromeos_sounds.h" 16 #include "chromeos/audio/chromeos_sounds.h"
18 #include "ui/aura/client/aura_constants.h" 17 #include "ui/aura/client/aura_constants.h"
19 #include "ui/compositor/layer.h" 18 #include "ui/compositor/layer.h"
20 #include "ui/compositor/scoped_layer_animation_settings.h" 19 #include "ui/compositor/scoped_layer_animation_settings.h"
21 #include "ui/views/widget/widget.h" 20 #include "ui/views/widget/widget.h"
22 #include "ui/wm/core/window_animations.h" 21 #include "ui/wm/core/window_animations.h"
23 #include "ui/wm/core/window_util.h" 22 #include "ui/wm/core/window_util.h"
24 23
25 namespace ash { 24 namespace ash {
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 if (!backdrop_) 234 if (!backdrop_)
236 return; 235 return;
237 backdrop_->Close(); 236 backdrop_->Close();
238 backdrop_ = nullptr; 237 backdrop_ = nullptr;
239 backdrop_window_ = nullptr; 238 backdrop_window_ = nullptr;
240 original_event_handler_ = nullptr; 239 original_event_handler_ = nullptr;
241 backdrop_event_handler_.reset(); 240 backdrop_event_handler_.reset();
242 } 241 }
243 242
244 } // namespace ash 243 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/window_util.cc ('k') | ash/wm/workspace/multi_window_resize_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698