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

Unified Diff: chrome/browser/ui/views/tabs/tab_drag_controller.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/views/tabs/tab_drag_controller.cc
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
index c2d2c7e5a8472844ced57334e2e46546f2178e83..7885a462c6d6c3bc5077f86b755a8d2bca870479 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -43,7 +43,7 @@
#include "ash/accelerators/accelerator_commands.h"
#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm/window_state.h"
-#include "ash/shell.h"
+#include "ash/common/wm_shell.h"
#include "ash/wm/window_state_aura.h"
#include "ui/wm/core/coordinate_conversion.h"
#endif
@@ -309,9 +309,10 @@ void TabDragController::Init(
source_tabstrip_->GetWidget()->SetCapture(source_tabstrip_);
#if defined(USE_ASH)
- if (ash::Shell::HasInstance() &&
- ash::Shell::GetInstance()->maximize_mode_controller()->
- IsMaximizeModeWindowManagerEnabled()) {
+ if (ash::WmShell::HasInstance() &&
+ ash::WmShell::Get()
+ ->maximize_mode_controller()
+ ->IsMaximizeModeWindowManagerEnabled()) {
detach_behavior_ = NOT_DETACHABLE;
}
#endif

Powered by Google App Engine
This is Rietveld 408576698