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

Unified Diff: chrome/browser/ui/webui/chromeos/touch_view_controller_delegate.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, 6 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: chrome/browser/ui/webui/chromeos/touch_view_controller_delegate.cc
diff --git a/chrome/browser/ui/webui/chromeos/touch_view_controller_delegate.cc b/chrome/browser/ui/webui/chromeos/touch_view_controller_delegate.cc
index e90ea679295300d695ac41cbb931479d4cb8cbc9..df571f2759ab9cbc323cbe4b58df2cb4bfc53efb 100644
--- a/chrome/browser/ui/webui/chromeos/touch_view_controller_delegate.cc
+++ b/chrome/browser/ui/webui/chromeos/touch_view_controller_delegate.cc
@@ -6,7 +6,6 @@
#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
-#include "ash/shell.h"
namespace chromeos {
@@ -27,8 +26,9 @@ void TouchViewControllerDelegate::RemoveObserver(Observer* observer) {
}
bool TouchViewControllerDelegate::IsMaximizeModeEnabled() const {
- return ash::Shell::GetInstance()->maximize_mode_controller()->
- IsMaximizeModeWindowManagerEnabled();
+ return ash::WmShell::Get()
+ ->maximize_mode_controller()
+ ->IsMaximizeModeWindowManagerEnabled();
}
void TouchViewControllerDelegate::OnMaximizeModeStarted() {
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_drag_controller.cc ('k') | components/arc/window_manager/arc_window_manager_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698