Chromium Code Reviews| 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 cbd87921f3bad37c1f05c645ab6d3d7d4c5da2d4..c08e3e963cc37ed6a4df2d70422b24b3b71ec00a 100644 |
| --- a/chrome/browser/android/banners/app_banner_manager.cc |
| +++ b/chrome/browser/android/banners/app_banner_manager.cc |
| @@ -24,8 +24,12 @@ |
| #include "chrome/common/chrome_switches.h" |
| #include "chrome/common/render_messages.h" |
| #include "content/public/browser/android/content_view_core.h" |
| +#include "content/public/browser/browser_context.h" |
| +#include "content/public/browser/browser_thread.h" |
| #include "content/public/browser/navigation_details.h" |
| #include "content/public/browser/render_frame_host.h" |
| +#include "content/public/browser/service_worker_context.h" |
| +#include "content/public/browser/storage_partition.h" |
| #include "content/public/browser/web_contents.h" |
| #include "content/public/common/frame_navigate_params.h" |
| #include "content/public/common/manifest.h" |
| @@ -45,7 +49,8 @@ const char kBannerTag[] = "google-play-id"; |
| namespace banners { |
| AppBannerManager::AppBannerManager(JNIEnv* env, jobject obj) |
| - : weak_java_banner_view_manager_(env, obj) {} |
| + : weak_java_banner_view_manager_(env, obj), weak_factory_(this) { |
| +} |
| AppBannerManager::~AppBannerManager() { |
| } |
| @@ -140,21 +145,34 @@ void AppBannerManager::OnDidGetManifest(const content::Manifest& manifest) { |
| return; |
| } |
| - // TODO(benwells): Check triggering parameters here and if there is a meta |
| - // tag. |
| - |
| - // Create an infobar to promote the manifest's app. |
| manifest_ = manifest; |
| - GURL icon_url = |
| - ManifestIconSelector::FindBestMatchingIcon( |
| - manifest.icons, |
| - GetPreferredIconSize(), |
| - gfx::Screen::GetScreenFor(web_contents()->GetNativeView())); |
| - if (icon_url.is_empty()) |
| - return; |
| + // Check to see if there is a single service worker controlling this page |
| + // and the manifest's start url. |
| + Profile* profile = |
| + Profile::FromBrowserContext(web_contents()->GetBrowserContext()); |
| + content::StoragePartition* storage_partition = |
| + content::BrowserContext::GetStoragePartition( |
| + profile, web_contents()->GetSiteInstance()); |
| + DCHECK(storage_partition); |
| + |
| + storage_partition->GetServiceWorkerContext()->CheckHasServiceWorker( |
| + validated_url_, manifest.start_url, |
| + base::Bind(&AppBannerManager::OnDidCheckHasServiceWorker, |
| + weak_factory_.GetWeakPtr())); |
| +} |
| + |
| +void AppBannerManager::OnDidCheckHasServiceWorker(bool has_same) { |
|
nhiroki
2015/02/06 05:36:33
|has_same| -> |has_service_worker|?
benwells
2015/02/06 12:24:59
Done.
|
| + if (has_same) { |
| + // TODO(benwells): Check triggering parameters. |
| + GURL icon_url = ManifestIconSelector::FindBestMatchingIcon( |
| + manifest_.icons, GetPreferredIconSize(), |
| + gfx::Screen::GetScreenFor(web_contents()->GetNativeView())); |
| + if (icon_url.is_empty()) |
| + return; |
| - FetchIcon(icon_url); |
| + FetchIcon(icon_url); |
| + } |
| } |
| bool AppBannerManager::OnMessageReceived(const IPC::Message& message) { |