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

Side by Side Diff: ash/common/wm_shell.cc

Issue 2113053003: Moves Shell::maximize_mode_controller() to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: order 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
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/common/wm_shell.h" 5 #include "ash/common/wm_shell.h"
6 6
7 #include "ash/common/focus_cycler.h" 7 #include "ash/common/focus_cycler.h"
8 #include "ash/common/keyboard/keyboard_ui.h" 8 #include "ash/common/keyboard/keyboard_ui.h"
9 #include "ash/common/shell_window_ids.h" 9 #include "ash/common/shell_window_ids.h"
10 #include "ash/common/system/chromeos/session/logout_confirmation_controller.h" 10 #include "ash/common/system/chromeos/session/logout_confirmation_controller.h"
11 #include "ash/common/system/tray/system_tray_delegate.h" 11 #include "ash/common/system/tray/system_tray_delegate.h"
12 #include "ash/common/system/tray/system_tray_notifier.h" 12 #include "ash/common/system/tray/system_tray_notifier.h"
13 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
13 #include "ash/common/wm/mru_window_tracker.h" 14 #include "ash/common/wm/mru_window_tracker.h"
14 #include "ash/common/wm/overview/window_selector_controller.h" 15 #include "ash/common/wm/overview/window_selector_controller.h"
15 #include "ash/common/wm_window.h" 16 #include "ash/common/wm_window.h"
16 #include "base/bind.h" 17 #include "base/bind.h"
17 #include "base/logging.h" 18 #include "base/logging.h"
18 19
19 namespace ash { 20 namespace ash {
20 21
21 // static 22 // static
22 WmShell* WmShell::instance_ = nullptr; 23 WmShell* WmShell::instance_ = nullptr;
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 #if defined(OS_CHROMEOS) 107 #if defined(OS_CHROMEOS)
107 logout_confirmation_controller_.reset(); 108 logout_confirmation_controller_.reset();
108 #endif 109 #endif
109 system_tray_delegate_.reset(); 110 system_tray_delegate_.reset();
110 } 111 }
111 112
112 void WmShell::DeleteWindowSelectorController() { 113 void WmShell::DeleteWindowSelectorController() {
113 window_selector_controller_.reset(); 114 window_selector_controller_.reset();
114 } 115 }
115 116
117 void WmShell::CreateMaximizeModeController() {
118 maximize_mode_controller_.reset(new MaximizeModeController);
119 }
120
121 void WmShell::DeleteMaximizeModeController() {
122 maximize_mode_controller_.reset();
123 }
124
116 void WmShell::CreateMruWindowTracker() { 125 void WmShell::CreateMruWindowTracker() {
117 mru_window_tracker_.reset(new MruWindowTracker); 126 mru_window_tracker_.reset(new MruWindowTracker);
118 } 127 }
119 128
120 void WmShell::DeleteMruWindowTracker() { 129 void WmShell::DeleteMruWindowTracker() {
121 mru_window_tracker_.reset(); 130 mru_window_tracker_.reset();
122 } 131 }
123 132
124 } // namespace ash 133 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/wm_shell.h ('k') | ash/content/display/screen_orientation_controller_chromeos_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698