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

Unified Diff: chrome/browser/ui/views/tabs/tab_drag_controller.cc

Issue 2766543002: Move even more from WmShell to Shell (Closed)
Patch Set: 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
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 7e5233195dd4c4f78fc5d0d0b204b238caf74c77..fe49d0bab1cfd19ca90dedc9756403bcfadacc90 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -44,7 +44,7 @@
#include "ash/common/accelerators/accelerator_commands.h" // nogncheck
#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" // nogncheck
#include "ash/common/wm/window_state.h" // nogncheck
-#include "ash/common/wm_shell.h" // nogncheck
+#include "ash/shell.h" // nogncheck
#include "ash/wm/window_state_aura.h" // nogncheck
#include "ui/wm/core/coordinate_conversion.h" // nogncheck
#endif
@@ -291,10 +291,9 @@ void TabDragController::Init(
source_tabstrip_->GetWidget()->SetCapture(source_tabstrip_);
#if defined(USE_ASH)
- if (ash::WmShell::HasInstance() &&
- ash::WmShell::Get()
- ->maximize_mode_controller()
- ->IsMaximizeModeWindowManagerEnabled()) {
+ if (ash::Shell::HasInstance() && ash::Shell::Get()
+ ->maximize_mode_controller()
+ ->IsMaximizeModeWindowManagerEnabled()) {
detach_behavior_ = NOT_DETACHABLE;
}
#endif

Powered by Google App Engine
This is Rietveld 408576698