Index: chrome/browser/ui/browser.cc |
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc |
index 9a43e9ec72cb041290a73a0c90e590c25a846a69..a14a713aa6323abedf2b6df473dfdd2a3d93f358 100644 |
--- a/chrome/browser/ui/browser.cc |
+++ b/chrome/browser/ui/browser.cc |
@@ -17,8 +17,8 @@ |
#include "base/logging.h" |
#include "base/metrics/histogram.h" |
#include "base/path_service.h" |
-#include "base/string_util.h" |
#include "base/string_number_conversions.h" |
+#include "base/string_util.h" |
#include "base/threading/thread.h" |
#include "base/threading/thread_restrictions.h" |
#include "base/time.h" |
@@ -3267,7 +3267,7 @@ void Browser::ContentsMouseEvent( |
if (source == GetSelectedTabContents()) { |
GetStatusBubble()->MouseMoved(location, !motion); |
if (!motion) |
- GetStatusBubble()->SetURL(GURL(), string16()); |
+ GetStatusBubble()->SetURL(GURL(), std::string()); |
} |
} |
@@ -3277,8 +3277,7 @@ void Browser::UpdateTargetURL(TabContents* source, const GURL& url) { |
if (source == GetSelectedTabContents()) { |
PrefService* prefs = profile_->GetPrefs(); |
- GetStatusBubble()->SetURL( |
- url, UTF8ToUTF16(prefs->GetString(prefs::kAcceptLanguages))); |
+ GetStatusBubble()->SetURL(url, prefs->GetString(prefs::kAcceptLanguages)); |
} |
} |