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

Unified Diff: ash/accelerators/debug_commands.cc

Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup. 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 side-by-side diff with in-line comments
Download patch
Index: ash/accelerators/debug_commands.cc
diff --git a/ash/accelerators/debug_commands.cc b/ash/accelerators/debug_commands.cc
index 541d1283047632186f7660b27d7e5ef5f45fb3a9..cd3d46d18d4762b40724e44a5ebfcf186ea97e6c 100644
--- a/ash/accelerators/debug_commands.cc
+++ b/ash/accelerators/debug_commands.cc
@@ -6,6 +6,7 @@
#include "ash/accelerators/accelerator_commands.h"
#include "ash/common/ash_switches.h"
+#include "ash/common/shell_delegate.h"
#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/debug.h"
@@ -15,7 +16,6 @@
#include "ash/host/ash_window_tree_host.h"
#include "ash/root_window_controller.h"
#include "ash/shell.h"
-#include "ash/shell_delegate.h"
#include "ash/system/toast/toast_data.h"
#include "ash/system/toast/toast_manager.h"
#include "ash/wm/window_util.h"
@@ -134,14 +134,12 @@ void HandleToggleDesktopBackgroundMode() {
void HandleToggleTouchpad() {
base::RecordAction(base::UserMetricsAction("Accel_Toggle_Touchpad"));
-
- ash::Shell::GetInstance()->delegate()->ToggleTouchpad();
+ ash::WmShell::Get()->delegate()->ToggleTouchpad();
}
void HandleToggleTouchscreen() {
base::RecordAction(base::UserMetricsAction("Accel_Toggle_Touchscreen"));
-
- ash::Shell::GetInstance()->delegate()->ToggleTouchscreen();
+ ash::WmShell::Get()->delegate()->ToggleTouchscreen();
}
void HandleToggleToggleTouchView() {

Powered by Google App Engine
This is Rietveld 408576698