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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/common/wm/maximize_mode/maximize_mode_event_handler.cc

Issue 2761063002: Move more from WmShell to Shell (Closed)
Patch Set: cleanup Created 3 years, 9 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
« no previous file with comments | « ash/common/test/wm_shell_test_api.cc ('k') | ash/common/wm/overview/window_selector_controller.cc » ('j') | ash/shell.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/maximize_mode/maximize_mode_event_handler.cc
diff --git a/ash/common/wm/maximize_mode/maximize_mode_event_handler.cc b/ash/common/wm/maximize_mode/maximize_mode_event_handler.cc
index da7750604e366de378f9b0f94c10931b8bc9abde..bcb87de5ee24fcf9626dae613477993c8ed275fb 100644
--- a/ash/common/wm/maximize_mode/maximize_mode_event_handler.cc
+++ b/ash/common/wm/maximize_mode/maximize_mode_event_handler.cc
@@ -10,6 +10,7 @@
#include "ash/common/wm/wm_event.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
+#include "ash/shell.h"
#include "ui/events/event.h"
namespace ash {
@@ -56,7 +57,7 @@ bool MaximizeModeEventHandler::ToggleFullscreen(const ui::TouchEvent& event) {
// Do not exit fullscreen in kiosk mode.
SystemTrayDelegate* system_tray_delegate =
- WmShell::Get()->system_tray_delegate();
+ Shell::Get()->system_tray_delegate();
if (system_tray_delegate->GetUserLoginStatus() == LoginStatus::KIOSK_APP ||
system_tray_delegate->GetUserLoginStatus() ==
LoginStatus::ARC_KIOSK_APP) {
« no previous file with comments | « ash/common/test/wm_shell_test_api.cc ('k') | ash/common/wm/overview/window_selector_controller.cc » ('j') | ash/shell.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698