diff options
| author | jnd@google.com <jnd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-21 02:58:09 +0000 |
|---|---|---|
| committer | jnd@google.com <jnd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-21 02:58:09 +0000 |
| commit | 1a3ebe10ead2ca99d2beb45b9ec65a2863406184 (patch) | |
| tree | b1c8b11cc0a32e1f561362ecee1b488bf7d91b15 /chrome/browser/tabs | |
| parent | aef050626d6412bffa292cbfcee23107cadc4b5d (diff) | |
| download | chromium_src-1a3ebe10ead2ca99d2beb45b9ec65a2863406184.zip chromium_src-1a3ebe10ead2ca99d2beb45b9ec65a2863406184.tar.gz chromium_src-1a3ebe10ead2ca99d2beb45b9ec65a2863406184.tar.bz2 | |
As Brett pointed it out, We normally use 8-bit for encoding names since they're always ASCII. Plus, wstrings will also be 32-bit characters on Linux and Mac, which is expensive. So I make this CL by using std::string instead of std::wstring every time you have an encoding name.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1144 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tabs')
| -rw-r--r-- | chrome/browser/tabs/dragged_tab_controller.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/tabs/dragged_tab_controller.h | 2 |
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, |