| Index: chrome/browser/android/shortcut_info.cc
|
| diff --git a/chrome/browser/android/shortcut_info.cc b/chrome/browser/android/shortcut_info.cc
|
| index 7811a601cb7a8f2c9a65c99b17b0d4303967fe1c..c4fca5c1036bbcc1fac474a0a2e0c7a7e0f014c0 100644
|
| --- a/chrome/browser/android/shortcut_info.cc
|
| +++ b/chrome/browser/android/shortcut_info.cc
|
| @@ -20,14 +20,13 @@ ShortcutInfo::~ShortcutInfo() {
|
| }
|
|
|
| void ShortcutInfo::UpdateFromManifest(const content::Manifest& manifest) {
|
| - if (!manifest.short_name.is_null())
|
| + if (!manifest.short_name.string().empty() ||
|
| + !manifest.name.string().empty()) {
|
| short_name = manifest.short_name.string();
|
| - if (!manifest.name.is_null())
|
| name = manifest.name.string();
|
| - if (manifest.short_name.is_null() != manifest.name.is_null()) {
|
| - if (manifest.short_name.is_null())
|
| + if (short_name.empty())
|
| short_name = name;
|
| - else
|
| + else if (name.empty())
|
| name = short_name;
|
| }
|
| user_title = short_name;
|
|
|