| Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc
|
| index 90cd8270d28b63ce411bcc80479112dcc72f4292..7bda8972fe54c42324814dd4e0a9053b11e98f7e 100644
|
| --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc
|
| +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc
|
| @@ -5,6 +5,7 @@
|
| #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h"
|
|
|
| #include "base/strings/string_util.h"
|
| +#include "base/strings/utf_string_conversions.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
|
| @@ -291,7 +292,7 @@ void ChromeLauncherControllerMus::PinAppsFromPrefs() {
|
|
|
| ash::mojom::ShelfItemPtr item(ash::mojom::ShelfItem::New());
|
| item->app_id = app_id;
|
| - item->app_title = mojo::String::From(
|
| + item->app_title = base::UTF16ToUTF8(
|
| launcher_controller_helper()->GetAppTitle(profile(), app_id));
|
| ResourceBundle& rb = ResourceBundle::GetSharedInstance();
|
| const gfx::Image& image = rb.GetImageNamed(IDR_APP_DEFAULT_ICON);
|
|
|