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

Unified Diff: chrome/browser/android/webapps/add_to_homescreen_data_fetcher.cc

Issue 1420743002: Web app: set a flag on the Intent if the icon was generated by Chromium. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@splashscreen-even-more-tests
Patch Set: review comments Created 5 years, 2 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
Index: chrome/browser/android/webapps/add_to_homescreen_data_fetcher.cc
diff --git a/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.cc b/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.cc
index 978053fa3d65b7d1fe9bfb9e6d8d230f4c799497..464e2f5e95400a12da5cd11c3216d555dd0cd2c9 100644
--- a/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.cc
+++ b/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.cc
@@ -235,9 +235,11 @@ void AddToHomescreenDataFetcher::CreateLauncherIcon(
&icon_bitmap);
}
+ bool is_generated = false;
if (weak_observer_) {
icon_bitmap = weak_observer_->FinalizeLauncherIcon(icon_bitmap,
- shortcut_info_.url);
+ shortcut_info_.url,
+ &is_generated);
}
content::BrowserThread::PostTask(
@@ -245,7 +247,8 @@ void AddToHomescreenDataFetcher::CreateLauncherIcon(
FROM_HERE,
base::Bind(&AddToHomescreenDataFetcher::NotifyObserver,
this,
- icon_bitmap));
+ icon_bitmap,
+ is_generated));
}
void AddToHomescreenDataFetcher::OnManifestIconFetched(const SkBitmap& icon) {
@@ -253,16 +256,18 @@ void AddToHomescreenDataFetcher::OnManifestIconFetched(const SkBitmap& icon) {
FetchFavicon();
return;
}
- NotifyObserver(icon);
+ NotifyObserver(icon, false);
}
-void AddToHomescreenDataFetcher::NotifyObserver(const SkBitmap& bitmap) {
+void AddToHomescreenDataFetcher::NotifyObserver(const SkBitmap& bitmap,
+ bool is_generated) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
if (!web_contents() || !weak_observer_ || is_icon_saved_)
return;
is_icon_saved_ = true;
shortcut_icon_ = bitmap;
+ shortcut_info_.is_icon_generated = is_generated;
is_ready_ = true;
weak_observer_->OnDataAvailable(shortcut_info_, shortcut_icon_);
}

Powered by Google App Engine
This is Rietveld 408576698