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/tab_contents | |
| 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/tab_contents')
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index 43c7c27..a5ffec0 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -802,7 +802,7 @@ void TabContents::CreateShortcut() { // effectively cancel the pending install request. pending_install_.page_id = entry->page_id(); pending_install_.icon = GetFavIcon(); - pending_install_.title = UTF16ToWideHack(GetTitle()); + pending_install_.title = GetTitle(); pending_install_.url = GetURL(); if (pending_install_.callback_functor) { pending_install_.callback_functor->Cancel(); @@ -810,7 +810,7 @@ void TabContents::CreateShortcut() { } DCHECK(!pending_install_.icon.isNull()) << "Menu item should be disabled."; if (pending_install_.title.empty()) - pending_install_.title = UTF8ToWide(GetURL().spec()); + pending_install_.title = UTF8ToUTF16(GetURL().spec()); // Request the application info. When done OnDidGetApplicationInfo is invoked // and we'll create the shortcut. diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h index 47b4243..7aa1f7f 100644 --- a/chrome/browser/tab_contents/tab_contents.h +++ b/chrome/browser/tab_contents/tab_contents.h @@ -670,7 +670,7 @@ class TabContents : public PageNavigator, struct PendingInstall { int32 page_id; SkBitmap icon; - std::wstring title; + string16 title; GURL url; // This object receives the GearsCreateShortcutCallback and routes the // message back to the TabContents, if we haven't been deleted. |