| 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/browser_tab_strip_controller.h" | 5 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h" |
| 6 | 6 |
| 7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
| 9 #include "base/task_runner_util.h" | 9 #include "base/task_runner_util.h" |
| 10 #include "base/threading/sequenced_worker_pool.h" | 10 #include "base/threading/sequenced_worker_pool.h" |
| (...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 if (index != -1 && !drop_before) { | 332 if (index != -1 && !drop_before) { |
| 333 hover_tab_selector_.StartTabTransition(index); | 333 hover_tab_selector_.StartTabTransition(index); |
| 334 } else { | 334 } else { |
| 335 hover_tab_selector_.CancelTabTransition(); | 335 hover_tab_selector_.CancelTabTransition(); |
| 336 } | 336 } |
| 337 } | 337 } |
| 338 | 338 |
| 339 void BrowserTabStripController::PerformDrop(bool drop_before, | 339 void BrowserTabStripController::PerformDrop(bool drop_before, |
| 340 int index, | 340 int index, |
| 341 const GURL& url) { | 341 const GURL& url) { |
| 342 chrome::NavigateParams params(browser_, url, content::PAGE_TRANSITION_LINK); | 342 chrome::NavigateParams params(browser_, url, ui::PAGE_TRANSITION_LINK); |
| 343 params.tabstrip_index = index; | 343 params.tabstrip_index = index; |
| 344 | 344 |
| 345 if (drop_before) { | 345 if (drop_before) { |
| 346 content::RecordAction(UserMetricsAction("Tab_DropURLBetweenTabs")); | 346 content::RecordAction(UserMetricsAction("Tab_DropURLBetweenTabs")); |
| 347 params.disposition = NEW_FOREGROUND_TAB; | 347 params.disposition = NEW_FOREGROUND_TAB; |
| 348 } else { | 348 } else { |
| 349 content::RecordAction(UserMetricsAction("Tab_DropURLOnTab")); | 349 content::RecordAction(UserMetricsAction("Tab_DropURLOnTab")); |
| 350 params.disposition = CURRENT_TAB; | 350 params.disposition = CURRENT_TAB; |
| 351 params.source_contents = model_->GetWebContentsAt(index); | 351 params.source_contents = model_->GetWebContentsAt(index); |
| 352 } | 352 } |
| (...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 579 url, | 579 url, |
| 580 mime_type.empty() || | 580 mime_type.empty() || |
| 581 net::IsSupportedMimeType(mime_type) || | 581 net::IsSupportedMimeType(mime_type) || |
| 582 content::PluginService::GetInstance()->GetPluginInfo( | 582 content::PluginService::GetInstance()->GetPluginInfo( |
| 583 -1, // process ID | 583 -1, // process ID |
| 584 MSG_ROUTING_NONE, // routing ID | 584 MSG_ROUTING_NONE, // routing ID |
| 585 model_->profile()->GetResourceContext(), | 585 model_->profile()->GetResourceContext(), |
| 586 url, GURL(), mime_type, false, | 586 url, GURL(), mime_type, false, |
| 587 NULL, &plugin, NULL)); | 587 NULL, &plugin, NULL)); |
| 588 } | 588 } |
| OLD | NEW |