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

Side by Side Diff: ash/accelerators/debug_commands.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
« no previous file with comments | « no previous file | ash/app_list/app_list_presenter_delegate.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/accelerators/debug_commands.h" 5 #include "ash/accelerators/debug_commands.h"
6 6
7 #include "ash/accelerators/accelerator_commands.h" 7 #include "ash/accelerators/accelerator_commands.h"
8 #include "ash/common/ash_switches.h" 8 #include "ash/common/ash_switches.h"
9 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" 9 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
10 #include "ash/common/wm_shell.h"
10 #include "ash/debug.h" 11 #include "ash/debug.h"
11 #include "ash/desktop_background/desktop_background_controller.h" 12 #include "ash/desktop_background/desktop_background_controller.h"
12 #include "ash/desktop_background/user_wallpaper_delegate.h" 13 #include "ash/desktop_background/user_wallpaper_delegate.h"
13 #include "ash/display/display_manager.h" 14 #include "ash/display/display_manager.h"
14 #include "ash/host/ash_window_tree_host.h" 15 #include "ash/host/ash_window_tree_host.h"
15 #include "ash/root_window_controller.h" 16 #include "ash/root_window_controller.h"
16 #include "ash/shell.h" 17 #include "ash/shell.h"
17 #include "ash/shell_delegate.h" 18 #include "ash/shell_delegate.h"
18 #include "ash/system/toast/toast_data.h" 19 #include "ash/system/toast/toast_data.h"
19 #include "ash/system/toast/toast_manager.h" 20 #include "ash/system/toast/toast_manager.h"
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 } 139 }
139 140
140 void HandleToggleTouchscreen() { 141 void HandleToggleTouchscreen() {
141 base::RecordAction(base::UserMetricsAction("Accel_Toggle_Touchscreen")); 142 base::RecordAction(base::UserMetricsAction("Accel_Toggle_Touchscreen"));
142 143
143 ash::Shell::GetInstance()->delegate()->ToggleTouchscreen(); 144 ash::Shell::GetInstance()->delegate()->ToggleTouchscreen();
144 } 145 }
145 146
146 void HandleToggleToggleTouchView() { 147 void HandleToggleToggleTouchView() {
147 MaximizeModeController* controller = 148 MaximizeModeController* controller =
148 Shell::GetInstance()->maximize_mode_controller(); 149 WmShell::Get()->maximize_mode_controller();
149 controller->EnableMaximizeModeWindowManager( 150 controller->EnableMaximizeModeWindowManager(
150 !controller->IsMaximizeModeWindowManagerEnabled()); 151 !controller->IsMaximizeModeWindowManagerEnabled());
151 } 152 }
152 153
153 #endif // defined(OS_CHROMEOS) 154 #endif // defined(OS_CHROMEOS)
154 155
155 } // namespace 156 } // namespace
156 157
157 void PrintUIHierarchies() { 158 void PrintUIHierarchies() {
158 // This is a separate command so the user only has to hit one key to generate 159 // This is a separate command so the user only has to hit one key to generate
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 case DEBUG_TOGGLE_SHOW_PAINT_RECTS: 223 case DEBUG_TOGGLE_SHOW_PAINT_RECTS:
223 ToggleShowPaintRects(); 224 ToggleShowPaintRects();
224 break; 225 break;
225 default: 226 default:
226 break; 227 break;
227 } 228 }
228 } 229 }
229 230
230 } // namespace debug 231 } // namespace debug
231 } // namespace ash 232 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/app_list/app_list_presenter_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698