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> |
(...skipping 1635 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1646 disposition:&disposition]; | 1646 disposition:&disposition]; |
1647 | 1647 |
1648 // Either insert a new tab or open in a current tab. | 1648 // Either insert a new tab or open in a current tab. |
1649 switch (disposition) { | 1649 switch (disposition) { |
1650 case NEW_FOREGROUND_TAB: | 1650 case NEW_FOREGROUND_TAB: |
1651 UserMetrics::RecordAction(UserMetricsAction("Tab_DropURLBetweenTabs"), | 1651 UserMetrics::RecordAction(UserMetricsAction("Tab_DropURLBetweenTabs"), |
1652 browser_->profile()); | 1652 browser_->profile()); |
1653 browser_->AddTabWithURL(url, GURL(), PageTransition::TYPED, index, | 1653 browser_->AddTabWithURL(url, GURL(), PageTransition::TYPED, index, |
1654 TabStripModel::ADD_SELECTED | | 1654 TabStripModel::ADD_SELECTED | |
1655 TabStripModel::ADD_FORCE_INDEX, | 1655 TabStripModel::ADD_FORCE_INDEX, |
1656 NULL, std::string()); | 1656 NULL, std::string(), NULL); |
1657 break; | 1657 break; |
1658 case CURRENT_TAB: | 1658 case CURRENT_TAB: |
1659 UserMetrics::RecordAction(UserMetricsAction("Tab_DropURLOnTab"), | 1659 UserMetrics::RecordAction(UserMetricsAction("Tab_DropURLOnTab"), |
1660 browser_->profile()); | 1660 browser_->profile()); |
1661 tabStripModel_->GetTabContentsAt(index)->OpenURL(url, GURL(), CURRENT_TAB, | 1661 tabStripModel_->GetTabContentsAt(index)->OpenURL(url, GURL(), CURRENT_TAB, |
1662 PageTransition::TYPED); | 1662 PageTransition::TYPED); |
1663 tabStripModel_->SelectTabContentsAt(index, true); | 1663 tabStripModel_->SelectTabContentsAt(index, true); |
1664 break; | 1664 break; |
1665 default: | 1665 default: |
1666 NOTIMPLEMENTED(); | 1666 NOTIMPLEMENTED(); |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1815 return; | 1815 return; |
1816 | 1816 |
1817 TabContentsController* tabController = | 1817 TabContentsController* tabController = |
1818 [tabContentsArray_ objectAtIndex:index]; | 1818 [tabContentsArray_ objectAtIndex:index]; |
1819 TabContents* devtoolsContents = contents ? | 1819 TabContents* devtoolsContents = contents ? |
1820 DevToolsWindow::GetDevToolsContents(contents) : NULL; | 1820 DevToolsWindow::GetDevToolsContents(contents) : NULL; |
1821 [tabController showDevToolsContents:devtoolsContents]; | 1821 [tabController showDevToolsContents:devtoolsContents]; |
1822 } | 1822 } |
1823 | 1823 |
1824 @end | 1824 @end |
OLD | NEW |