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

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

Issue 2700523004: Remove docked windows entirely in M59. (Closed)
Patch Set: Rebase Created 3 years, 10 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..68eeba448f40c8dd4eb4951944012f6901741435 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -87,15 +87,15 @@ const int kStackedDistance = 36;
const int kMaximizedWindowInset = 10; // DIPs.
#if defined(USE_ASH)
-// Returns true if |tab_strip| browser window is docked.
-bool IsDockedOrSnapped(const TabStrip* tab_strip) {
+// Returns true if |tab_strip| browser window is snapped.
+bool IsSnapped(const TabStrip* tab_strip) {
DCHECK(tab_strip);
ash::wm::WindowState* window_state =
ash::wm::GetWindowState(tab_strip->GetWidget()->GetNativeWindow());
- return window_state->IsDocked() || window_state->IsSnapped();
+ return window_state->IsSnapped();
}
#else
-bool IsDockedOrSnapped(const TabStrip* tab_strip) {
+bool IsSnapped(const TabStrip* tab_strip) {
return false;
}
#endif
@@ -1476,7 +1476,7 @@ void TabDragController::CompleteDrag() {
if (attached_tabstrip_) {
if (is_dragging_new_browser_ || did_restore_window_) {
- if (IsDockedOrSnapped(attached_tabstrip_)) {
+ if (IsSnapped(attached_tabstrip_)) {
was_source_maximized_ = false;
was_source_fullscreen_ = false;
}

Powered by Google App Engine
This is Rietveld 408576698