Handling default service in the web intents picker controller.

chrome/browser/ui/intents/web_intent_picker_controller.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_UI_INTENTS_WEB_INTENT_PICKER_CONTROLLER_H_
 #define CHROME_BROWSER_UI_INTENTS_WEB_INTENT_PICKER_CONTROLLER_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 86 matching lines @@
 
   // Exposed for tests only.
   void set_model_observer(WebIntentPickerModelObserver* observer) {
     picker_model_->set_observer(observer);
   }
 
   // Called when WebIntentServiceData is returned from the WebIntentsRegistry.
   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.
+  void RegistryCallsCompleted();

[groby-ooo-7-16, 2012/04/24 21:36:51]

That's a rather vague description :)

[Greg Billock, 2012/04/25 16:04:32]

improved.

On 2012/04/24 21:36:51, groby wrote:

+
+  // Bottom half for dispatching explicit intents. Receives WebIntentServiceData
+  // from the WebIntentsRegistry to check for known urls/extensions and find
+  // disposition data.
+  void WebIntentServicesForExplicitIntent(
+      const std::vector<webkit_glue::WebIntentServiceData>& services);
+
   // Called when FaviconData is returned from the FaviconService.
   void OnFaviconDataAvailable(FaviconService::Handle handle,
                               history::FaviconData favicon_data);
 
   // Called when IntentExtensionInfo is returned from the CWSIntentsRegistry.
   void OnCWSIntentServicesAvailable(
       const CWSIntentsRegistry::IntentExtensionList& extensions);
 
   // Called when a suggested extension's icon is fetched.
   void OnExtensionIconURLFetchComplete(const string16& extension_id,
@@ skipping 17 matching lines @@
   // When an extension is installed, all that is known is the extension id.
   // This callback receives the intent service data for that extension.
   // |services| must be a non-empty list.
   void OnExtensionInstallServiceAvailable(
       const std::vector<webkit_glue::WebIntentServiceData>& services);
 
   // Decrements the |pending_async_count_| and notifies the picker if it
   // reaches zero.
   void AsyncOperationFinished();
 
+  // If the picker dialog UI surface needs to be created, this creates it.
+  void CreatePicker();

[groby-ooo-7-16, 2012/04/24 21:36:51]

"Helper to create picker dialog UI" is probably enough of a description.

[Greg Billock, 2012/04/25 16:04:32]

Done.

+
   // Closes the currently active picker.
   void ClosePicker();
 
   // A weak pointer to the tab contents that the picker is displayed on.
   TabContentsWrapper* wrapper_;
 
   // A notification registrar, listening for notifications when the tab closes
   // to close the picker ui.
   content::NotificationRegistrar registrar_;
 
   // A weak pointer to the picker this controller controls.
   WebIntentPicker* picker_;
 
   // The model for the picker. Owned by this controller. It should not be NULL
   // while this controller exists, even if the picker is not shown.
   scoped_ptr<WebIntentPickerModel> picker_model_;
 
   // 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.
   bool picker_shown_;
 
+  // Will be set to the non-empty url of the default service if the
+  // WebIntentsRegistry finds a default service matching the intent being
+  // dispatched.
+  std::string default_service_url_;

[groby-ooo-7-16, 2012/04/24 21:36:51]

Doesn't that belong on the model?

[Greg Billock, 2012/04/25 16:04:32]

Yeah, you're right. It has "action" too. Rejiggering...

+
   // Weak pointer to the routing object for the renderer which launched the
   // intent. Contains the intent data and a way to signal back to the
   // client page.
   content::WebIntentsDispatcher* intents_dispatcher_;
 
   // Weak pointer to the tab servicing the intent. Remembered in order to
   // close it when a reply is sent.
   content::WebContents* service_tab_;
 
+  // The browser in which the intent was invoked.
+  Browser* browser_;

[groby-ooo-7-16, 2012/04/24 21:36:51]

That's available from the TabContentsWrapper, IIRC.

[Greg Billock, 2012/04/25 16:04:32]

Yes, we're currently using static methods to look it up. Should we do that, or
just write it down from ShowDialog? (Or get rid of the arg to ShowDialog if we
don't need it...)

+
+  // The intent action the picker is handling.
+  string16 action_;

[groby-ooo-7-16, 2012/04/24 21:36:51]

Do we have to store that here? Can't we query the picker?

[Greg Billock, 2012/04/25 16:04:32]

This is stored from ShowDialog, where now we don't show the picker yet in that
method.

+
   // Request consumer used when asynchronously loading favicons.
   CancelableRequestConsumerTSimple<size_t> favicon_consumer_;
 
   base::WeakPtrFactory<WebIntentPickerController> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebIntentPickerController);
 };
 
 #endif  // CHROME_BROWSER_UI_INTENTS_WEB_INTENT_PICKER_CONTROLLER_H_