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

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: 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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 } 115 }
115 116
116 void WmShell::CreateMruWindowTracker() { 117 void WmShell::CreateMruWindowTracker() {
117 mru_window_tracker_.reset(new MruWindowTracker); 118 mru_window_tracker_.reset(new MruWindowTracker);
118 } 119 }
119 120
120 void WmShell::DeleteMruWindowTracker() { 121 void WmShell::DeleteMruWindowTracker() {
121 mru_window_tracker_.reset(); 122 mru_window_tracker_.reset();
122 } 123 }
123 124
125 void WmShell::CreateMaximizeModeController() {
James Cook 2016/07/01 20:09:09 nit: Match header file order
sky 2016/07/01 20:13:56 Done.
126 maximize_mode_controller_.reset(new MaximizeModeController);
127 }
128
129 void WmShell::DeleteMaximizeModeController() {
130 maximize_mode_controller_.reset();
131 }
132
124 } // namespace ash 133 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698