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

Unified Diff: chrome/browser/ui/intents/web_intent_picker_controller.cc

Issue 10834188: [Web Intents] Small refactor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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/ui/intents/web_intent_picker_controller.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/intents/web_intent_picker_controller.cc
diff --git a/chrome/browser/ui/intents/web_intent_picker_controller.cc b/chrome/browser/ui/intents/web_intent_picker_controller.cc
index 38eb5f2e0019f76a62e0aa1adc8e8e561609b313..23bb584d1eeabefe56d3194e458ffcc6a2c2346f 100644
--- a/chrome/browser/ui/intents/web_intent_picker_controller.cc
+++ b/chrome/browser/ui/intents/web_intent_picker_controller.cc
@@ -465,25 +465,31 @@ void WebIntentPickerController::OnSendReturnMessage(
intents_dispatcher_ = NULL;
}
-void WebIntentPickerController::OnWebIntentServicesAvailable(
- const std::vector<webkit_glue::WebIntentServiceData>& services) {
+void WebIntentPickerController::AddServiceToModel(
+ const webkit_glue::WebIntentServiceData& service) {
FaviconService* favicon_service = GetFaviconService(tab_contents_);
- for (size_t i = 0; i < services.size(); ++i) {
- picker_model_->AddInstalledService(
- services[i].title,
- services[i].service_url,
- ConvertDisposition(services[i].disposition));
- pending_async_count_++;
- FaviconService::Handle handle = favicon_service->GetFaviconForURL(
- services[i].service_url,
- history::FAVICON,
- &favicon_consumer_,
- base::Bind(
- &WebIntentPickerController::OnFaviconDataAvailable,
- weak_ptr_factory_.GetWeakPtr()));
- favicon_consumer_.SetClientData(favicon_service, handle, i);
- }
+ picker_model_->AddInstalledService(
+ service.title,
+ service.service_url,
+ ConvertDisposition(service.disposition));
+
+ pending_async_count_++;
+ FaviconService::Handle handle = favicon_service->GetFaviconForURL(
+ service.service_url,
+ history::FAVICON,
+ &favicon_consumer_,
+ base::Bind(
+ &WebIntentPickerController::OnFaviconDataAvailable,
+ weak_ptr_factory_.GetWeakPtr()));
+ favicon_consumer_.SetClientData(
+ favicon_service, handle, picker_model_->GetInstalledServiceCount() - 1);
+}
+
+void WebIntentPickerController::OnWebIntentServicesAvailable(
+ const std::vector<webkit_glue::WebIntentServiceData>& services) {
+ for (size_t i = 0; i < services.size(); ++i)
+ AddServiceToModel(services[i]);
RegistryCallsCompleted();
AsyncOperationFinished();
@@ -497,23 +503,7 @@ void WebIntentPickerController::WebIntentServicesForExplicitIntent(
if (services[i].service_url != intents_dispatcher_->GetIntent().service)
continue;
- picker_model_->AddInstalledService(
- services[i].title,
- services[i].service_url,
- ConvertDisposition(services[i].disposition));
-
- pending_async_count_++;
- FaviconService* favicon_service = GetFaviconService(tab_contents_);
- FaviconService::Handle handle = favicon_service->GetFaviconForURL(
- services[i].service_url,
- history::FAVICON,
- &favicon_consumer_,
- base::Bind(
- &WebIntentPickerController::OnFaviconDataAvailable,
- weak_ptr_factory_.GetWeakPtr()));
- favicon_consumer_.SetClientData(
- favicon_service, handle,
- picker_model_->GetInstalledServiceCount() - 1);
+ AddServiceToModel(services[i]);
if (services[i].disposition ==
webkit_glue::WebIntentServiceData::DISPOSITION_INLINE)
« no previous file with comments | « chrome/browser/ui/intents/web_intent_picker_controller.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698