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

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

Issue 2671853002: Rename best icon to best primary icon in Web app related code. (Closed)
Patch Set: Created 3 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
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 cc11a59bf46ac648cdff950cea631d3c6649dc15..175be65617f785ac177d55a37c5ff4aa1e1d49a6 100644
--- a/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.cc
+++ b/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.cc
@@ -162,9 +162,9 @@ bool AddToHomescreenDataFetcher::OnMessageReceived(
bool handled = true;
IPC_BEGIN_MESSAGE_MAP(AddToHomescreenDataFetcher, message)
- IPC_MESSAGE_HANDLER(ChromeViewHostMsg_DidGetWebApplicationInfo,
- OnDidGetWebApplicationInfo)
- IPC_MESSAGE_UNHANDLED(handled = false)
+ IPC_MESSAGE_HANDLER(ChromeViewHostMsg_DidGetWebApplicationInfo,
dominickn 2017/02/02 23:34:13 The standard Chromium style is to have IPC_MESSAGE
F 2017/02/03 00:47:15 Running clang-format restored the old formatting.
+ OnDidGetWebApplicationInfo)
+ IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP()
return handled;
@@ -220,7 +220,7 @@ void AddToHomescreenDataFetcher::OnDidPerformInstallableCheck(
weak_observer_->OnUserTitleAvailable(shortcut_info_.user_title);
if (data.primary_icon) {
- shortcut_info_.best_icon_url = data.primary_icon_url;
+ shortcut_info_.best_primary_icon_url = data.primary_icon_url;
CreateLauncherIcon(*(data.primary_icon));
return;
@@ -276,19 +276,17 @@ void AddToHomescreenDataFetcher::CreateLauncherIconFromFaviconInBackground(
bitmap_result.bitmap_data->size(), &raw_icon);
}
- shortcut_info_.best_icon_url = bitmap_result.icon_url;
+ shortcut_info_.best_primary_icon_url = bitmap_result.icon_url;
CreateLauncherIconInBackground(raw_icon);
}
void AddToHomescreenDataFetcher::CreateLauncherIcon(const SkBitmap& raw_icon) {
- DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
- content::BrowserThread::GetBlockingPool()
- ->PostWorkerTaskWithShutdownBehavior(
- FROM_HERE,
- base::Bind(
- &AddToHomescreenDataFetcher::CreateLauncherIconInBackground,
- this, raw_icon),
- base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
+ DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+ content::BrowserThread::GetBlockingPool()->PostWorkerTaskWithShutdownBehavior(
+ FROM_HERE,
+ base::Bind(&AddToHomescreenDataFetcher::CreateLauncherIconInBackground,
+ this, raw_icon),
+ base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
}
void AddToHomescreenDataFetcher::CreateLauncherIconInBackground(
@@ -303,7 +301,7 @@ void AddToHomescreenDataFetcher::CreateLauncherIconInBackground(
}
if (is_generated)
- shortcut_info_.best_icon_url = GURL();
+ shortcut_info_.best_primary_icon_url = GURL();
content::BrowserThread::PostTask(
content::BrowserThread::UI, FROM_HERE,

Powered by Google App Engine
This is Rietveld 408576698