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

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

Issue 10204010: Handling default service in the web intents picker controller. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head Created 8 years, 8 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 | « no previous file | chrome/browser/ui/intents/web_intent_picker_controller.cc » ('j') | 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.h
diff --git a/chrome/browser/ui/intents/web_intent_picker_controller.h b/chrome/browser/ui/intents/web_intent_picker_controller.h
index 902b5c54b8d8765646eecd334904efec840d0223..62d1759aaab6eb93cbb51845da2672926fde10fb 100644
--- a/chrome/browser/ui/intents/web_intent_picker_controller.h
+++ b/chrome/browser/ui/intents/web_intent_picker_controller.h
@@ -103,6 +103,17 @@ class WebIntentPickerController : public content::NotificationObserver,
void OnWebIntentServicesAvailable(
const std::vector<webkit_glue::WebIntentServiceData>& services);
+ // Called when a default service is returned from the WebIntentsRegistry.
+ // (Still called with default_service.service_url empty if there are no
+ // defaults.)
+ void OnWebIntentDefaultsAvailable(
+ const DefaultWebIntentService& default_service);
+
+ // Coordination method which is delegated to by the registry calls to get
+ // services and defaults. Checks whether the picker should be shown or if
+ // default choices allow it to be skipped.
+ void RegistryCallsCompleted();
+
// Called when WebIntentServiceData is ready for checking extensions
// when dispatching explicit intents. Gets |services|
// from the WebIntentsRegistry to check for known urls/extensions and find
@@ -170,6 +181,9 @@ class WebIntentPickerController : public content::NotificationObserver,
// A count of the outstanding asynchronous calls.
int pending_async_count_;
+ // A count of outstanding WebIntentsRegistry calls.
+ int pending_registry_calls_count_;
+
// Is true if the picker is currently visible.
// This bool is not equivalent to picker != NULL in a unit test. In that
// case, a picker may be non-NULL before it is shown.
« no previous file with comments | « no previous file | chrome/browser/ui/intents/web_intent_picker_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698