[MediaRouter] Moved the code useful for Android to MediaRouterDialogController

chrome/browser/media/router/media_router_dialog_controller.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_MEDIA_ROUTER_MEDIA_ROUTER_DIALOG_CONTROLLER_H_
 #define CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_DIALOG_CONTROLLER_H_
 
 #include "base/macros.h"
+#include "base/memory/scoped_ptr.h"
 #include "chrome/browser/media/router/create_presentation_session_request.h"
+#include "content/public/browser/web_contents_observer.h"
 
 namespace content {
 class WebContents;
 }  // namespace content
 
 namespace media_router {
 
 // An implementation of this interface is tied to a WebContents known as the

[imcheng, 2015/07/23 00:41:14]

nit: It is no longer an interface but an abstract base class.

 // initiator, and is lazily created when a Media Router dialog needs to be
 // shown. The MediaRouterDialogController allows creating, querying, and
 // removing a Media Router dialog modal to the initiator WebContents.
 // This class is not thread safe and must be called on the UI thread.
 class MediaRouterDialogController {
  public:
-  virtual ~MediaRouterDialogController() = default;
+  virtual ~MediaRouterDialogController();
 
   // Gets a reference to the MediaRouterDialogController associated with
   // |web_contents|, creating one if it does not exist. The returned pointer is
   // guaranteed to be non-null.
   static MediaRouterDialogController* GetOrCreateForWebContents(
       content::WebContents* web_contents);
 
   // Creates a Media Router modal dialog using the initiator and parameters
   // specified in |request|. If the dialog already exists, brings the dialog
   // to the front, but does not change the dialog with |request|.
   // Returns WebContents for the media router dialog if a dialog was created.
   // Otherwise returns false and |request| is deleted.
   virtual bool ShowMediaRouterDialogForPresentation(
       scoped_ptr<CreatePresentationSessionRequest> request) = 0;
+
+  // Closes the media router dialog.
+  // It is an error to call this function if there is currently no dialog.
+  virtual void CloseMediaRouterDialog() = 0;
+
+protected:

[imcheng, 2015/07/23 00:41:14]

nit:indent

[whywhat, 2015/07/23 21:20:09]

Done.

+  // Use MediaRouterDialogController::GetOrCreateForWebContents() to create an
+  // instance.
+  explicit MediaRouterDialogController(content::WebContents* initiator);
+
+  void ActivateInitiatorWebContents();
+  void CreateMediaRouterDialog();
+  scoped_ptr<CreatePresentationSessionRequest> PassPresentationRequest();
+  void SetPresentationRequest(
+      scoped_ptr<CreatePresentationSessionRequest> request);
+
+  content::WebContents* initiator() { return initiator_; }
+
+  virtual void Reset() = 0;

[imcheng, 2015/07/23 00:41:14]

this needs documentation.

[whywhat, 2015/07/23 21:20:09]

Done.

+
+private:

[imcheng, 2015/07/23 00:41:14]

nit: indent

[whywhat, 2015/07/23 21:20:09]

Done.

+  class InitiatorWebContentsObserver;
+
+  scoped_ptr<InitiatorWebContentsObserver> initiator_observer_;
+  content::WebContents* const initiator_;
+
+  // Data for dialogs created under a Presentation API context.
+  // Passed from the caller of ShowMediaRouterDialogForPresentation(), and
+  // passed to the dialog when it is initialized.
+  scoped_ptr<CreatePresentationSessionRequest> presentation_request_;
 };

[imcheng, 2015/07/23 00:41:14]

DISALLOW_COPY_AND_ASSIGN ?

[whywhat, 2015/07/23 21:20:09]

Done.

 
 }  // namespace media_router
 
 #endif  // CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_DIALOG_CONTROLLER_H_