summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/tabs
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/views/tabs')
-rw-r--r--chrome/browser/views/tabs/dragged_tab_controller.cc13
-rw-r--r--chrome/browser/views/tabs/dragged_tab_controller.h3
2 files changed, 6 insertions, 10 deletions
diff --git a/chrome/browser/views/tabs/dragged_tab_controller.cc b/chrome/browser/views/tabs/dragged_tab_controller.cc
index 81b5386..82c002e 100644
--- a/chrome/browser/views/tabs/dragged_tab_controller.cc
+++ b/chrome/browser/views/tabs/dragged_tab_controller.cc
@@ -141,18 +141,15 @@ bool DraggedTabController::IsDragSourceTab(Tab* tab) const {
///////////////////////////////////////////////////////////////////////////////
// DraggedTabController, PageNavigator implementation:
-void DraggedTabController::OpenURLFromTab(
- TabContents* source,
- const GURL& url,
- WindowOpenDisposition disposition,
- PageTransition::Type transition,
- const std::string& override_encoding) {
+void DraggedTabController::OpenURLFromTab(TabContents* source,
+ const GURL& url,
+ WindowOpenDisposition disposition,
+ PageTransition::Type transition) {
if (original_delegate_) {
if (disposition == CURRENT_TAB)
disposition = NEW_WINDOW;
- original_delegate_->OpenURLFromTab(source, url, disposition, transition,
- override_encoding);
+ original_delegate_->OpenURLFromTab(source, url, disposition, transition);
}
}
diff --git a/chrome/browser/views/tabs/dragged_tab_controller.h b/chrome/browser/views/tabs/dragged_tab_controller.h
index 6c6aed6..5874661 100644
--- a/chrome/browser/views/tabs/dragged_tab_controller.h
+++ b/chrome/browser/views/tabs/dragged_tab_controller.h
@@ -81,8 +81,7 @@ class DraggedTabController : public TabContentsDelegate,
virtual void OpenURLFromTab(TabContents* source,
const GURL& url,
WindowOpenDisposition disposition,
- PageTransition::Type transition,
- const std::string& override_encoding);
+ PageTransition::Type transition);
virtual void NavigationStateChanged(const TabContents* source,
unsigned changed_flags);
virtual void ReplaceContents(TabContents* source,