[Media Router] Wiring for searching route providers for new sinks.

chrome/browser/ui/webui/media_router/media_router_ui.h

 // Copyright 2015 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_WEBUI_MEDIA_ROUTER_MEDIA_ROUTER_UI_H_
 #define CHROME_BROWSER_UI_WEBUI_MEDIA_ROUTER_MEDIA_ROUTER_UI_H_
 
 #include <memory>
 #include <set>
 #include <string>
@@ skipping 99 matching lines @@
 
   // Calls MediaRouter to close the given route.
   void CloseRoute(const MediaRoute::Id& route_id);
 
   // Calls MediaRouter to add the given issue.
   void AddIssue(const Issue& issue);
 
   // Calls MediaRouter to clear the given issue.
   void ClearIssue(const Issue::Id& issue_id);
 
+  // Calls MediaRouter to search route providers for sinks matching
+  // |search_criteria| with the source that is currently associated with
+  // |cast_mode|. The user's domain |domain| is also used.
+  bool SearchSinksAndCreateRoute(const MediaSink::Id& sink_id,
+                                 const std::string& search_criteria,
+                                 const std::string& domain,
+                                 MediaCastMode cast_mode);
+
   // Returns the hostname of the default source's parent frame URL.
   std::string GetPresentationRequestSourceName() const;
   std::string GetTruncatedPresentationRequestSourceName() const;
   bool HasPendingRouteRequest() const {
     return current_route_request_id_ != -1;
   }
   const std::vector<MediaSinkWithCastModes>& sinks() const { return sinks_; }
   const std::vector<MediaRoute>& routes() const { return routes_; }
   const std::vector<MediaRoute::Id>& joinable_route_ids() const {
     return joinable_route_ids_;
@@ skipping 71 matching lines @@
 
   // Callback passed to MediaRouter to receive response to route creation
   // requests.
   void OnRouteResponseReceived(
       int route_request_id,
       const MediaSink::Id& sink_id,
       MediaCastMode cast_mode,
       const base::string16& presentation_request_source_name,
       const RouteRequestResult& result);
 
+  // Callback passed to MediaRouter to receive the sink ID of the sink found by
+  // SearchSinksAndCreateRoute().
+  void OnSearchSinkResponseReceived(const std::string& sink_id);
+
   // Creates and sends an issue if route creation timed out.
   void SendIssueForRouteTimeout(
       MediaCastMode cast_mode,
       const base::string16& presentation_request_source_name);
 
   // Initializes the dialog with mirroring sources derived from |initiator|.
   void InitCommon(content::WebContents* initiator);
 
   // PresentationServiceDelegateImpl::DefaultPresentationObserver
   void OnDefaultPresentationChanged(
       const PresentationRequest& presentation_request) override;
   void OnDefaultPresentationRemoved() override;
 
-  // Creates a brand new route or, if a |route_id| is supplied, connects to a
-  // non-local route. This is used for connecting to a non-local route.
-  // Returns true if a route request is successfully submitted.
-  // OnRouteResponseReceived() will be invoked when the route request
-  // completes.
-  bool CreateOrConnectRoute(const MediaSink::Id& sink_id,
-                            MediaCastMode cast_mode,
-                            const MediaRoute::Id& route_id);
+  // Populates common route-related parameters for CreateRoute(),
+  // ConnectRoute(), and SearchSinksAndCreateRoute().
+  bool GetCreateOrConnectRouteParameters(

[apacible, 2016/04/08 21:02:12]

Rename this to be more general? Previously it was just used for CreateRoute()
and ConnectRoute().

[btolsch, 2016/04/08 21:55:04]

The use by SearchSinksAndCreateRoute() is identical to the CreateRoute() case.
Is there something you think makes more sense?

[apacible, 2016/04/08 22:07:47]

Something like SetRouteParamters()?

[btolsch, 2016/04/11 08:19:35]

Done.

+      const MediaSink::Id& sink_id,
+      MediaCastMode cast_mode,
+      MediaSource::Id* source_id,
+      GURL* origin,
+      std::vector<MediaRouteResponseCallback>* route_response_callbacks,
+      base::TimeDelta* timeout,
+      bool* off_the_record);
 
   // Updates the set of supported cast modes and sends the updated set to
   // |handler_|.
   void UpdateCastModes();
 
   // Returns the default presentation request's frame URL if there is one.
   // Otherwise returns an empty GURL.
   GURL GetFrameURL() const;
 
   // Owned by the |web_ui| passed in the ctor, and guaranteed to be deleted
@@ skipping 55 matching lines @@
   // NOTE: Weak pointers must be invalidated before all other member variables.
   // Therefore |weak_factory_| must be placed at the end.
   base::WeakPtrFactory<MediaRouterUI> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaRouterUI);
 };
 
 }  // namespace media_router
 
 #endif  // CHROME_BROWSER_UI_WEBUI_MEDIA_ROUTER_MEDIA_ROUTER_UI_H_