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

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

Issue 2157393002: Moves WindowCycleList/Controller to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Feedback and std::move 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_window.h ('k') | ash/mus/bridge/wm_window_mus.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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 DeleteSystemTrayDelegate(); 123 DeleteSystemTrayDelegate();
124 // Has to happen before ~MruWindowTracker.
125 DeleteWindowCycleController();
124 DeleteWindowSelectorController(); 126 DeleteWindowSelectorController();
125 DeleteMruWindowTracker(); 127 DeleteMruWindowTracker();
126 RemoveClientObserver(); 128 RemoveClientObserver();
127 WmShell::Set(nullptr); 129 WmShell::Set(nullptr);
128 } 130 }
129 131
130 // static 132 // static
131 WmShellMus* WmShellMus::Get() { 133 WmShellMus* WmShellMus::Get() {
132 return static_cast<WmShellMus*>(WmShell::Get()); 134 return static_cast<WmShellMus*>(WmShell::Get());
133 } 135 }
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 OnWindowActivated(gained_active, lost_active)); 347 OnWindowActivated(gained_active, lost_active));
346 } 348 }
347 349
348 void WmShellMus::OnDidDestroyClient(::ui::WindowTreeClient* client) { 350 void WmShellMus::OnDidDestroyClient(::ui::WindowTreeClient* client) {
349 DCHECK_EQ(client, client_); 351 DCHECK_EQ(client, client_);
350 RemoveClientObserver(); 352 RemoveClientObserver();
351 } 353 }
352 354
353 } // namespace mus 355 } // namespace mus
354 } // namespace ash 356 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/wm_window.h ('k') | ash/mus/bridge/wm_window_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698