OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #import "chrome/browser/cocoa/tab_strip_controller.h" | 5 #import "chrome/browser/cocoa/tab_strip_controller.h" |
6 | 6 |
7 #import <QuartzCore/QuartzCore.h> | 7 #import <QuartzCore/QuartzCore.h> |
8 | 8 |
9 #include <limits> | 9 #include <limits> |
10 #include <string> | 10 #include <string> |
11 | 11 |
12 #include "app/l10n_util.h" | 12 #include "app/l10n_util.h" |
13 #include "app/resource_bundle.h" | 13 #include "app/resource_bundle.h" |
14 #include "base/mac_util.h" | 14 #include "base/mac_util.h" |
15 #include "base/nsimage_cache_mac.h" | 15 #include "base/nsimage_cache_mac.h" |
16 #include "base/sys_string_conversions.h" | 16 #include "base/sys_string_conversions.h" |
17 #include "chrome/app/chrome_dll_resource.h" | 17 #include "chrome/app/chrome_dll_resource.h" |
18 #include "chrome/browser/browser.h" | 18 #include "chrome/browser/browser.h" |
| 19 #include "chrome/browser/browser_navigator.h" |
19 #include "chrome/browser/find_bar.h" | 20 #include "chrome/browser/find_bar.h" |
20 #include "chrome/browser/find_bar_controller.h" | 21 #include "chrome/browser/find_bar_controller.h" |
21 #include "chrome/browser/metrics/user_metrics.h" | 22 #include "chrome/browser/metrics/user_metrics.h" |
22 #include "chrome/browser/profile.h" | 23 #include "chrome/browser/profile.h" |
23 #import "chrome/browser/cocoa/browser_window_controller.h" | 24 #import "chrome/browser/cocoa/browser_window_controller.h" |
24 #import "chrome/browser/cocoa/constrained_window_mac.h" | 25 #import "chrome/browser/cocoa/constrained_window_mac.h" |
25 #import "chrome/browser/cocoa/new_tab_button.h" | 26 #import "chrome/browser/cocoa/new_tab_button.h" |
26 #import "chrome/browser/cocoa/tab_strip_view.h" | 27 #import "chrome/browser/cocoa/tab_strip_view.h" |
27 #import "chrome/browser/cocoa/tab_contents_controller.h" | 28 #import "chrome/browser/cocoa/tab_contents_controller.h" |
28 #import "chrome/browser/cocoa/tab_controller.h" | 29 #import "chrome/browser/cocoa/tab_controller.h" |
(...skipping 1661 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1690 WindowOpenDisposition disposition; | 1691 WindowOpenDisposition disposition; |
1691 [self droppingURLsAt:point | 1692 [self droppingURLsAt:point |
1692 givesIndex:&index | 1693 givesIndex:&index |
1693 disposition:&disposition]; | 1694 disposition:&disposition]; |
1694 | 1695 |
1695 // Either insert a new tab or open in a current tab. | 1696 // Either insert a new tab or open in a current tab. |
1696 switch (disposition) { | 1697 switch (disposition) { |
1697 case NEW_FOREGROUND_TAB: { | 1698 case NEW_FOREGROUND_TAB: { |
1698 UserMetrics::RecordAction(UserMetricsAction("Tab_DropURLBetweenTabs"), | 1699 UserMetrics::RecordAction(UserMetricsAction("Tab_DropURLBetweenTabs"), |
1699 browser_->profile()); | 1700 browser_->profile()); |
1700 Browser::AddTabWithURLParams params(url, PageTransition::TYPED); | 1701 browser::NavigateParams params(browser_, url, PageTransition::TYPED); |
1701 params.index = index; | 1702 params.disposition = disposition; |
1702 params.add_types = | 1703 params.tabstrip_index = index; |
| 1704 params.tabstrip_add_types = |
1703 TabStripModel::ADD_SELECTED | TabStripModel::ADD_FORCE_INDEX; | 1705 TabStripModel::ADD_SELECTED | TabStripModel::ADD_FORCE_INDEX; |
1704 browser_->AddTabWithURL(¶ms); | 1706 browser::Navigate(¶ms); |
1705 break; | 1707 break; |
1706 } | 1708 } |
1707 case CURRENT_TAB: | 1709 case CURRENT_TAB: |
1708 UserMetrics::RecordAction(UserMetricsAction("Tab_DropURLOnTab"), | 1710 UserMetrics::RecordAction(UserMetricsAction("Tab_DropURLOnTab"), |
1709 browser_->profile()); | 1711 browser_->profile()); |
1710 tabStripModel_->GetTabContentsAt(index)->OpenURL(url, GURL(), CURRENT_TAB, | 1712 tabStripModel_->GetTabContentsAt(index)->OpenURL(url, GURL(), CURRENT_TAB, |
1711 PageTransition::TYPED); | 1713 PageTransition::TYPED); |
1712 tabStripModel_->SelectTabContentsAt(index, true); | 1714 tabStripModel_->SelectTabContentsAt(index, true); |
1713 break; | 1715 break; |
1714 default: | 1716 default: |
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1842 NSInteger index = [self indexFromModelIndex:modelIndex]; | 1844 NSInteger index = [self indexFromModelIndex:modelIndex]; |
1843 BrowserWindowController* controller = | 1845 BrowserWindowController* controller = |
1844 (BrowserWindowController*)[[switchView_ window] windowController]; | 1846 (BrowserWindowController*)[[switchView_ window] windowController]; |
1845 DCHECK(index >= 0); | 1847 DCHECK(index >= 0); |
1846 if (index >= 0) { | 1848 if (index >= 0) { |
1847 [controller setTab:[self viewAtIndex:index] isDraggable:YES]; | 1849 [controller setTab:[self viewAtIndex:index] isDraggable:YES]; |
1848 } | 1850 } |
1849 } | 1851 } |
1850 | 1852 |
1851 @end | 1853 @end |
OLD | NEW |