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 |
-} |