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

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

Issue 9565004: Revert 124385 - Allows tab dragging when maximized on aura. To fix it I made it so (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_drag_controller2.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/tabs/tab_drag_controller2.cc
===================================================================
--- chrome/browser/ui/views/tabs/tab_drag_controller2.cc (revision 124386)
+++ chrome/browser/ui/views/tabs/tab_drag_controller2.cc (working copy)
@@ -40,10 +40,6 @@
#include "ui/views/widget/root_view.h"
#include "ui/views/widget/widget.h"
-#if defined(USE_AURA)
-#include "ash/wm/property_util.h"
-#endif
-
using content::UserMetricsAction;
using content::WebContents;
@@ -326,11 +322,8 @@
if (destroyed_)
*destroyed_ = true;
- if (move_loop_browser_view_) {
+ if (move_loop_browser_view_)
move_loop_browser_view_->set_move_observer(NULL);
- SetTrackedByWorkspace(
- move_loop_browser_view_->GetWidget()->GetNativeView(), true);
- }
if (source_tabstrip_)
GetModel(source_tabstrip_)->RemoveObserver(this);
@@ -1103,11 +1096,6 @@
bring_to_front_timer_.Stop();
if (is_dragging_window_) {
- if (type == NORMAL || (type == TAB_DESTROYED && drag_data_.size() > 1)) {
- SetTrackedByWorkspace(
- GetAttachedBrowserView()->GetWidget()->GetNativeView(), true);
- }
-
// End the nested drag loop.
GetAttachedBrowserView()->GetWidget()->EndMoveLoop();
waiting_for_run_loop_to_exit_ = true;
@@ -1403,14 +1391,6 @@
break; // Nothing to do for DETACH_ABOVE_OR_BELOW.
}
- SetTrackedByWorkspace(browser->window()->GetNativeHandle(), false);
browser->window()->SetBounds(new_bounds);
return browser;
}
-
-void TabDragController2::SetTrackedByWorkspace(gfx::NativeWindow window,
- bool value) {
-#if defined(USE_AURA)
- ash::SetTrackedByWorkspace(window, value);
-#endif
-}
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_drag_controller2.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698