chrome/browser/ui/views/tabs/tab_drag_controller.cc - Issue 12298037: Revert 183123

Side by Side Diff: chrome/browser/ui/views/tabs/tab_drag_controller.cc

Issue 12298037: Revert 183123 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1417/src/

Patch Set: Created 7 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/views/select_file_dialog_extension.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/ui/views/tabs/tab_drag_controller.h"	5 #include "chrome/browser/ui/views/tabs/tab_drag_controller.h"

6	6

7 #include <math.h>	7 #include <math.h>

8 #include <set>	8 #include <set>

9	9

10 #include "base/auto_reset.h"	10 #include "base/auto_reset.h"

11 #include "base/callback.h"	11 #include "base/callback.h"

12 #include "base/command_line.h"	12 #include "base/command_line.h"

13 #include "base/i18n/rtl.h"	13 #include "base/i18n/rtl.h"

14 #include "chrome/browser/extensions/extension_function_dispatcher.h"	14 #include "chrome/browser/extensions/extension_function_dispatcher.h"

15 #include "chrome/browser/profiles/profile.h"

16 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h"	15 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h"

17 #include "chrome/browser/ui/browser_window.h"	16 #include "chrome/browser/ui/browser_window.h"

18 #include "chrome/browser/ui/tabs/tab_strip_model.h"	17 #include "chrome/browser/ui/tabs/tab_strip_model.h"

19 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h"	18 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h"

20 #include "chrome/browser/ui/views/frame/browser_view.h"	19 #include "chrome/browser/ui/views/frame/browser_view.h"

21 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h"	20 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h"

22 #include "chrome/browser/ui/views/tabs/dragged_tab_view.h"	21 #include "chrome/browser/ui/views/tabs/dragged_tab_view.h"

23 #include "chrome/browser/ui/views/tabs/native_view_photobooth.h"	22 #include "chrome/browser/ui/views/tabs/native_view_photobooth.h"

24 #include "chrome/browser/ui/views/tabs/stacked_tab_strip_layout.h"	23 #include "chrome/browser/ui/views/tabs/stacked_tab_strip_layout.h"

25 #include "chrome/browser/ui/views/tabs/tab.h"	24 #include "chrome/browser/ui/views/tabs/tab.h"

(...skipping 2034 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2060 gfx::Vector2d TabDragController::GetWindowOffset(	2059 gfx::Vector2d TabDragController::GetWindowOffset(

2061 const gfx::Point& point_in_screen) {	2060 const gfx::Point& point_in_screen) {

2062 TabStrip* owning_tabstrip = (attached_tabstrip_ && detach_into_browser_) ?	2061 TabStrip* owning_tabstrip = (attached_tabstrip_ && detach_into_browser_) ?

2063 attached_tabstrip_ : source_tabstrip_;	2062 attached_tabstrip_ : source_tabstrip_;

2064 views::View* toplevel_view = owning_tabstrip->GetWidget()->GetContentsView();	2063 views::View* toplevel_view = owning_tabstrip->GetWidget()->GetContentsView();

2065	2064

2066 gfx::Point point = point_in_screen;	2065 gfx::Point point = point_in_screen;

2067 views::View::ConvertPointFromScreen(toplevel_view, &point);	2066 views::View::ConvertPointFromScreen(toplevel_view, &point);

2068 return point.OffsetFromOrigin();	2067 return point.OffsetFromOrigin();

2069 }	2068 }

OLD	NEW