Change a bunch of string types.

Started out just trying to change PrefService::GetString and ::SetString. This snowballed a little bit. Had to change a bunch of url strings in search_engines/ from wstring to string (some of them may be better off as GURLs, but UTF-8 is a step in the right direction, since that's what GURL uses internally, as well as externally via its setters/getters).

TODO (later patch): things that ask for accepted languages should use std::string, not std::wstring.

BUG=none
TEST=try bots

Review URL: http://codereview.chromium.org/2854015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51157 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 4 deletions

diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc
index 8c7deeb..c6caa97 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -115,9 +115,6 @@ static const int kSeparatorStartX = 2;
 // Left-padding for the instructional text.
 static const int kInstructionsPadding = 6;
 
-// Color of the instructional text.
-static const SkColor kInstructionsColor = SkColorSetRGB(128, 128, 142);
-
 // Tag for the 'Other bookmarks' button.
 static const int kOtherFolderButtonTag = 1;
 
@@ -193,7 +190,7 @@ class BookmarkButton : public views::TextButton {
     gfx::Point location(p);
     ConvertPointToScreen(this, &location);
     *tooltip = CreateToolTipForURLAndTitle(location, url_, text(),
-        profile_->GetPrefs()->GetString(prefs::kAcceptLanguages));
+        UTF8ToWide(profile_->GetPrefs()->GetString(prefs::kAcceptLanguages)));
     return !tooltip->empty();
   }