diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-20 19:25:42 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-20 19:25:42 +0000 |
commit | 00e3f152083aea092353b3d284c368b48136f33c (patch) | |
tree | 081df57119ba9301bebd7c7091efc4acab5accc9 /chrome/browser/gears_integration.cc | |
parent | 4e6f2f037e6d1956bc431ac37a72d8e6871586d8 (diff) | |
download | chromium_src-00e3f152083aea092353b3d284c368b48136f33c.zip chromium_src-00e3f152083aea092353b3d284c368b48136f33c.tar.gz chromium_src-00e3f152083aea092353b3d284c368b48136f33c.tar.bz2 |
Convert some structures in webkit/glue to string16.
R=yaar
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/305002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29549 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gears_integration.cc')
-rw-r--r-- | chrome/browser/gears_integration.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/gears_integration.cc b/chrome/browser/gears_integration.cc index 97c7de8..da08df3 100644 --- a/chrome/browser/gears_integration.cc +++ b/chrome/browser/gears_integration.cc @@ -233,17 +233,17 @@ struct RunnableMethodTraits<CreateShortcutCommand> { void GearsCreateShortcut( const webkit_glue::WebApplicationInfo& app_info, - const std::wstring& fallback_name, + const string16& fallback_name, const GURL& fallback_url, const SkBitmap& fallback_icon, GearsCreateShortcutCallback* callback) { - std::wstring name = + string16 name = !app_info.title.empty() ? app_info.title : fallback_name; - std::string orig_name_utf8 = WideToUTF8(name); + std::string orig_name_utf8 = UTF16ToUTF8(name); EnsureStringValidPathComponent(name); - std::string name_utf8 = WideToUTF8(name); - std::string description_utf8 = WideToUTF8(app_info.description); + std::string name_utf8 = UTF16ToUTF8(name); + std::string description_utf8 = UTF16ToUTF8(app_info.description); const GURL& url = !app_info.app_url.is_empty() ? app_info.app_url : fallback_url; |