Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5225)

Unified Diff: chrome/browser/android/banners/app_banner_manager.cc

Issue 899543003: Break out more manifest parsing logic from ShortcutHelper (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebasing Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/android/banners/app_banner_manager.h ('k') | chrome/browser/android/shortcut_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/banners/app_banner_manager.cc
diff --git a/chrome/browser/android/banners/app_banner_manager.cc b/chrome/browser/android/banners/app_banner_manager.cc
index 6ac43a046c9abd3a123519763f116fb4f1e7aa06..cbd87921f3bad37c1f05c645ab6d3d7d4c5da2d4 100644
--- a/chrome/browser/android/banners/app_banner_manager.cc
+++ b/chrome/browser/android/banners/app_banner_manager.cc
@@ -9,10 +9,13 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/metrics/histogram.h"
+#include "base/threading/worker_pool.h"
#include "chrome/browser/android/banners/app_banner_infobar_delegate.h"
#include "chrome/browser/android/banners/app_banner_metrics_ids.h"
#include "chrome/browser/android/banners/app_banner_utilities.h"
#include "chrome/browser/android/manifest_icon_selector.h"
+#include "chrome/browser/android/shortcut_helper.h"
+#include "chrome/browser/android/shortcut_info.h"
#include "chrome/browser/banners/app_banner_settings_helper.h"
#include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h"
#include "chrome/browser/infobars/infobar_service.h"
@@ -77,7 +80,7 @@ void AppBannerManager::Install() const {
return;
if (!manifest_.IsEmpty()) {
- // TODO(dfalcantara): Trigger shortcut creation.
+ InstallManifestApp(manifest_, *app_icon_.get());
}
}
@@ -127,8 +130,10 @@ void AppBannerManager::OnDidGetManifest(const content::Manifest& manifest) {
if (web_contents()->IsBeingDestroyed())
return;
- if (manifest.IsEmpty()) {
- // No manifest, see if there is a play store meta tag.
+ if (manifest.IsEmpty()
+ || !manifest.start_url.is_valid()
+ || (manifest.name.is_null() && manifest.short_name.is_null())) {
+ // No usable manifest, see if there is a play store meta tag.
Send(new ChromeViewMsg_RetrieveMetaTagContent(routing_id(),
validated_url_,
kBannerTag));
@@ -266,6 +271,20 @@ int AppBannerManager::GetPreferredIconSize() {
return Java_AppBannerManager_getPreferredIconSize(env, jobj.obj());
}
+// static
+void AppBannerManager::InstallManifestApp(const content::Manifest& manifest,
+ const SkBitmap& icon) {
+ ShortcutInfo info;
+ info.UpdateFromManifest(manifest);
+
+ base::WorkerPool::PostTask(
+ FROM_HERE,
+ base::Bind(&ShortcutHelper::AddShortcutInBackgroundWithSkBitmap,
+ info,
+ icon),
+ true);
+}
+
void RecordDismissEvent(JNIEnv* env, jclass clazz, jint metric) {
banners::TrackDismissEvent(metric);
}
« no previous file with comments | « chrome/browser/android/banners/app_banner_manager.h ('k') | chrome/browser/android/shortcut_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698