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

Side by Side Diff: ash/accelerators/debug_commands.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 | « no previous file | ash/common/wm_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 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/shell_delegate.h" 9 #include "ash/common/shell_delegate.h"
10 #include "ash/common/system/toast/toast_data.h" 10 #include "ash/common/system/toast/toast_data.h"
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 void PerformDebugActionIfEnabled(AcceleratorAction action) { 170 void PerformDebugActionIfEnabled(AcceleratorAction action) {
171 if (!DebugAcceleratorsEnabled()) 171 if (!DebugAcceleratorsEnabled())
172 return; 172 return;
173 173
174 switch (action) { 174 switch (action) {
175 #if defined(OS_CHROMEOS) 175 #if defined(OS_CHROMEOS)
176 case DEBUG_ADD_REMOVE_DISPLAY: 176 case DEBUG_ADD_REMOVE_DISPLAY:
177 Shell::GetInstance()->display_manager()->AddRemoveDisplay(); 177 Shell::GetInstance()->display_manager()->AddRemoveDisplay();
178 break; 178 break;
179 case DEBUG_SHOW_TOAST: 179 case DEBUG_SHOW_TOAST:
180 Shell::GetInstance()->toast_manager()->Show( 180 WmShell::Get()->toast_manager()->Show(
181 ToastData("id", "Toast", 5000 /* duration_ms */, "Dismiss")); 181 ToastData("id", "Toast", 5000 /* duration_ms */, "Dismiss"));
182 break; 182 break;
183 case DEBUG_TOGGLE_TOUCH_PAD: 183 case DEBUG_TOGGLE_TOUCH_PAD:
184 HandleToggleTouchpad(); 184 HandleToggleTouchpad();
185 break; 185 break;
186 case DEBUG_TOGGLE_TOUCH_SCREEN: 186 case DEBUG_TOGGLE_TOUCH_SCREEN:
187 HandleToggleTouchscreen(); 187 HandleToggleTouchscreen();
188 break; 188 break;
189 case DEBUG_TOGGLE_TOUCH_VIEW: 189 case DEBUG_TOGGLE_TOUCH_VIEW:
190 HandleToggleToggleTouchView(); 190 HandleToggleToggleTouchView();
(...skipping 30 matching lines...) Expand all
221 case DEBUG_TOGGLE_SHOW_PAINT_RECTS: 221 case DEBUG_TOGGLE_SHOW_PAINT_RECTS:
222 ToggleShowPaintRects(); 222 ToggleShowPaintRects();
223 break; 223 break;
224 default: 224 default:
225 break; 225 break;
226 } 226 }
227 } 227 }
228 228
229 } // namespace debug 229 } // namespace debug
230 } // namespace ash 230 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/common/wm_shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698