Retry icon fetching after intent_helper is ready

components/arc/intent_helper/link_handler_model_impl.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/arc/intent_helper/link_handler_model_impl.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 97 matching lines @@
     mojo::Array<mojom::UrlHandlerInfoPtr> handlers) {
   handlers_ = std::move(handlers);
 
   bool icon_info_notified = false;
   if (icon_loader_) {
     std::vector<ActivityIconLoader::ActivityName> activities;
     for (size_t i = 0; i < handlers_.size(); ++i) {
       activities.emplace_back(handlers_[i]->package_name,
                               handlers_[i]->activity_name);
     }
-    icon_info_notified = icon_loader_->GetActivityIcons(
+    const ActivityIconLoader::GetResult result = icon_loader_->GetActivityIcons(
         activities, base::Bind(&LinkHandlerModelImpl::NotifyObserver,
                                weak_ptr_factory_.GetWeakPtr()));
+    icon_info_notified =
+        (result != ActivityIconLoader::GetResult::SUCCEEDED_ASYNC);

[Luis Héctor Chávez, 2016/06/02 16:59:47]

Isn't the intention "result == ActivityIconLoader::GetResult::SUCCEEDED_SYNC"?

[Yusuke Sato, 2016/06/02 18:03:19]

GetResult::FAILED_* also run the callback actually. Updated the
ActivityIconLoader function comment.

[Luis Héctor Chávez, 2016/06/02 20:03:51]

Makes more sense now :)

nit: Can you add a small function in ActivityIconLoader that encapsulates this
logic and give it a useful name that indicates that the callback has been
triggered to avoid future confusion?

[Yusuke Sato, 2016/06/02 21:07:27]

Great idea, done.

   }
 
   if (!icon_info_notified) {
     // Call NotifyObserver() without icon information, unless
     // GetActivityIcons has already called it. Otherwise if we delay the
     // notification waiting for all icons, context menu may flicker.
     NotifyObserver(nullptr);
   }
 }
 
@@ skipping 41 matching lines @@
   if (!GetQueryValue(url, kKeyToFind, &value))
     return url;
 
   const GURL new_url(value);
   if (!new_url.is_valid())
     return url;
   return new_url;
 }
 
 }  // namespace arc