Index: chrome/browser/android/shortcut_helper.cc |
diff --git a/chrome/browser/android/shortcut_helper.cc b/chrome/browser/android/shortcut_helper.cc |
index 00ccdb87411e72814c04f9307df1a01e9be38688..58e0d125f4ea3c03cbd2fd24ef56cf817ff56b7b 100644 |
--- a/chrome/browser/android/shortcut_helper.cc |
+++ b/chrome/browser/android/shortcut_helper.cc |
@@ -23,6 +23,7 @@ |
#include "content/public/browser/web_contents.h" |
#include "content/public/browser/web_contents_observer.h" |
#include "content/public/common/frame_navigate_params.h" |
+#include "content/public/common/manifest.h" |
#include "jni/ShortcutHelper_jni.h" |
#include "ui/gfx/android/java_bitmap.h" |
#include "ui/gfx/codec/png_codec.h" |
@@ -71,6 +72,16 @@ void ShortcutHelper::OnDidGetWebApplicationInfo( |
title_ = web_app_info.title.empty() ? web_contents()->GetTitle() |
: web_app_info.title; |
+ web_contents()->GetManifest(base::Bind(&ShortcutHelper::OnDidGetManifest, |
+ base::Unretained(this))); |
+} |
+ |
+void ShortcutHelper::OnDidGetManifest(const content::Manifest& manifest) { |
+ if (!manifest.short_name.is_null()) |
+ title_ = manifest.short_name.string(); |
+ else if (!manifest.name.is_null()) |
+ title_ = manifest.name.string(); |
+ |
JNIEnv* env = base::android::AttachCurrentThread(); |
Mike West
2014/09/17 07:57:00
Nit: For clarity, I'd suggest breaking this block
mlamouri (slow - plz ping)
2014/09/17 08:47:11
Done.
|
ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env); |
ScopedJavaLocalRef<jstring> j_title = |