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

Side by Side Diff: ash/mus/bridge/wm_shell_mus.cc

Issue 2171493002: Moves ToastManager from Shell to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove include Created 4 years, 5 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/common/wm_shell.cc ('k') | ash/shell.h » ('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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/mus/bridge/wm_shell_mus.h" 5 #include "ash/mus/bridge/wm_shell_mus.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/common/display/display_info.h" 9 #include "ash/common/display/display_info.h"
10 #include "ash/common/keyboard/keyboard_ui.h" 10 #include "ash/common/keyboard/keyboard_ui.h"
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 // TODO(jamescook): Port ash::sysui::KeyboardUIMus and use it here. 113 // TODO(jamescook): Port ash::sysui::KeyboardUIMus and use it here.
114 SetKeyboardUI(KeyboardUI::Create()); 114 SetKeyboardUI(KeyboardUI::Create());
115 } 115 }
116 116
117 WmShellMus::~WmShellMus() { 117 WmShellMus::~WmShellMus() {
118 // This order mirrors that of Shell. 118 // This order mirrors that of Shell.
119 119
120 // Destroy maximize mode controller early on since it has some observers which 120 // Destroy maximize mode controller early on since it has some observers which
121 // need to be removed. 121 // need to be removed.
122 DeleteMaximizeModeController(); 122 DeleteMaximizeModeController();
123 DeleteToastManager();
123 DeleteSystemTrayDelegate(); 124 DeleteSystemTrayDelegate();
124 // Has to happen before ~MruWindowTracker. 125 // Has to happen before ~MruWindowTracker.
125 DeleteWindowCycleController(); 126 DeleteWindowCycleController();
126 DeleteWindowSelectorController(); 127 DeleteWindowSelectorController();
127 DeleteMruWindowTracker(); 128 DeleteMruWindowTracker();
128 RemoveClientObserver(); 129 RemoveClientObserver();
129 WmShell::Set(nullptr); 130 WmShell::Set(nullptr);
130 } 131 }
131 132
132 // static 133 // static
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 OnWindowActivated(gained_active, lost_active)); 349 OnWindowActivated(gained_active, lost_active));
349 } 350 }
350 351
351 void WmShellMus::OnDidDestroyClient(::ui::WindowTreeClient* client) { 352 void WmShellMus::OnDidDestroyClient(::ui::WindowTreeClient* client) {
352 DCHECK_EQ(client, client_); 353 DCHECK_EQ(client, client_);
353 RemoveClientObserver(); 354 RemoveClientObserver();
354 } 355 }
355 356
356 } // namespace mus 357 } // namespace mus
357 } // namespace ash 358 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/wm_shell.cc ('k') | ash/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698