summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tabs
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/tabs')
-rw-r--r--chrome/browser/tabs/dragged_tab_controller.cc2
-rw-r--r--chrome/browser/tabs/dragged_tab_controller.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/tabs/dragged_tab_controller.cc b/chrome/browser/tabs/dragged_tab_controller.cc
index cdfb8df..eca0438 100644
--- a/chrome/browser/tabs/dragged_tab_controller.cc
+++ b/chrome/browser/tabs/dragged_tab_controller.cc
@@ -171,7 +171,7 @@ void DraggedTabController::OpenURLFromTab(
const GURL& url,
WindowOpenDisposition disposition,
PageTransition::Type transition,
- const std::wstring& override_encoding) {
+ const std::string& override_encoding) {
if (original_delegate_) {
if (disposition == CURRENT_TAB)
disposition = NEW_WINDOW;
diff --git a/chrome/browser/tabs/dragged_tab_controller.h b/chrome/browser/tabs/dragged_tab_controller.h
index e95776d..bc961f2 100644
--- a/chrome/browser/tabs/dragged_tab_controller.h
+++ b/chrome/browser/tabs/dragged_tab_controller.h
@@ -107,7 +107,7 @@ class DraggedTabController : public TabContentsDelegate,
const GURL& url,
WindowOpenDisposition disposition,
PageTransition::Type transition,
- const std::wstring& override_encoding);
+ const std::string& override_encoding);
virtual void NavigationStateChanged(const TabContents* source,
unsigned changed_flags);
virtual void ReplaceContents(TabContents* source,