Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3015)

Unified Diff: chrome/browser/ui/browser.cc

Issue 7686015: ui: Pass the parameter |languages| of StatusBubble::SetURL() as std::string. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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));
}
}
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/status_bubble_mac.h » ('j') | chrome/browser/ui/cocoa/status_bubble_mac.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698