[MediaRouter] The minimal change to make everything build on Android.

chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc

 // 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.
 
-#include "chrome/browser/ui/webui/media_router/media_router_dialog_controller.h"
+#include "chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.h"
 
 #include <string>
 #include <vector>
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"
 #include "chrome/browser/ui/webui/media_router/media_router_ui.h"
 #include "chrome/common/url_constants.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "ui/web_dialogs/web_dialog_delegate.h"
 #include "ui/web_dialogs/web_dialog_web_contents_delegate.h"
 #include "url/gurl.h"
 
-DEFINE_WEB_CONTENTS_USER_DATA_KEY(media_router::MediaRouterDialogController);
+DEFINE_WEB_CONTENTS_USER_DATA_KEY(
+    media_router::MediaRouterDialogControllerImpl);
 
 using content::LoadCommittedDetails;
 using content::NavigationController;
 using content::WebContents;
 using content::WebUIMessageHandler;
 using ui::WebDialogDelegate;
 
 namespace media_router {
 
 namespace {
@@ skipping 54 matching lines @@
 #if defined(OS_MACOSX)
   *size = gfx::Size(330, 400);
 #else
   // size is not used because the dialog is auto-resizeable.
   *size = gfx::Size();
 #endif
 }
 
 }  // namespace
 
-// static
-MediaRouterDialogController*
-MediaRouterDialogController::GetOrCreateForWebContents(
+  // static

[apacible, 2015/07/20 14:10:32]

nit: No indentation

[whywhat, 2015/07/20 14:27:47]

Done.

+MediaRouterDialogControllerImpl*
+MediaRouterDialogControllerImpl::GetOrCreateForWebContents(
     WebContents* web_contents) {
   DCHECK(web_contents);
   // This call does nothing if the controller already exists.
-  MediaRouterDialogController::CreateForWebContents(web_contents);
-  return MediaRouterDialogController::FromWebContents(web_contents);
+  MediaRouterDialogControllerImpl::CreateForWebContents(web_contents);
+  return MediaRouterDialogControllerImpl::FromWebContents(web_contents);
 }
 
-class MediaRouterDialogController::DialogWebContentsObserver
+class MediaRouterDialogControllerImpl::DialogWebContentsObserver
     : public content::WebContentsObserver {
  public:
   DialogWebContentsObserver(
       WebContents* web_contents,
-      MediaRouterDialogController* dialog_controller)
+      MediaRouterDialogControllerImpl* dialog_controller)
       : content::WebContentsObserver(web_contents),
         dialog_controller_(dialog_controller) {
   }
 
  private:
   void WebContentsDestroyed() override {
     // The dialog is already closed. No need to call Close() again.
     // NOTE: |this| is deleted after Reset() returns.
     dialog_controller_->Reset();
   }
 
   void NavigationEntryCommitted(const LoadCommittedDetails& load_details)
       override {
     dialog_controller_->OnDialogNavigated(load_details);
   }
 
   void RenderProcessGone(base::TerminationStatus status) override {
     // NOTE: |this| is deleted after CloseMediaRouterDialog() returns.
     dialog_controller_->CloseMediaRouterDialog();
   }
 
-  MediaRouterDialogController* const dialog_controller_;
+  MediaRouterDialogControllerImpl* const dialog_controller_;
 };
 
-class MediaRouterDialogController::InitiatorWebContentsObserver
+class MediaRouterDialogControllerImpl::InitiatorWebContentsObserver
     : public content::WebContentsObserver {
  public:
   InitiatorWebContentsObserver(
       WebContents* web_contents,
-      MediaRouterDialogController* dialog_controller)
+      MediaRouterDialogControllerImpl* dialog_controller)
       : content::WebContentsObserver(web_contents),
         dialog_controller_(dialog_controller) {
   }
 
  private:
   void WebContentsDestroyed() override {
     // NOTE: |this| is deleted after CloseMediaRouterDialog() returns.
     dialog_controller_->CloseMediaRouterDialog();
   }
 
   void NavigationEntryCommitted(const LoadCommittedDetails& load_details)
       override {
     // NOTE: |this| is deleted after CloseMediaRouterDialog() returns.
     dialog_controller_->CloseMediaRouterDialog();
   }
 
   void RenderProcessGone(base::TerminationStatus status) override {
     // NOTE: |this| is deleted after CloseMediaRouterDialog() returns.
     dialog_controller_->CloseMediaRouterDialog();
   }
 
-  MediaRouterDialogController* const dialog_controller_;
+  MediaRouterDialogControllerImpl* const dialog_controller_;
 };
 
-MediaRouterDialogController::MediaRouterDialogController(
+MediaRouterDialogControllerImpl::MediaRouterDialogControllerImpl(
     WebContents* web_contents)
     : initiator_(web_contents),
       media_router_dialog_pending_(false) {
   DCHECK(initiator_);
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 }
 
-MediaRouterDialogController::~MediaRouterDialogController() {
+MediaRouterDialogControllerImpl::~MediaRouterDialogControllerImpl() {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
-WebContents* MediaRouterDialogController::ShowMediaRouterDialog() {
+WebContents* MediaRouterDialogControllerImpl::ShowMediaRouterDialog() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // Get the media router dialog for |initiator|, or create a new dialog
   // if not found.
   WebContents* media_router_dialog = GetMediaRouterDialog();
   if (!media_router_dialog) {
     CreateMediaRouterDialog();
     return GetMediaRouterDialog();
   }
 
   // Show the initiator holding the existing media router dialog.
   initiator_->GetDelegate()->ActivateContents(initiator_);
   return media_router_dialog;
 }
 
-WebContents* MediaRouterDialogController::ShowMediaRouterDialogForPresentation(
+bool MediaRouterDialogControllerImpl::ShowMediaRouterDialogForPresentation(
     scoped_ptr<CreateSessionRequest> request) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // Get the media router dialog for |initiator|, or create a new dialog
   // if not found.
   WebContents* media_router_dialog = GetMediaRouterDialog();
   if (!media_router_dialog) {
     CreateMediaRouterDialog();
     media_router_dialog = GetMediaRouterDialog();
     presentation_request_ = request.Pass();
-    return media_router_dialog;
+    return true;
   }
 
   // Show the initiator holding the existing media router dialog.
   initiator_->GetDelegate()->ActivateContents(initiator_);
-  return nullptr;
+  return false;
 }
 
-WebContents* MediaRouterDialogController::GetMediaRouterDialog() const {
+WebContents* MediaRouterDialogControllerImpl::GetMediaRouterDialog() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   return dialog_observer_.get() ? dialog_observer_->web_contents() : nullptr;
 }
 
-void MediaRouterDialogController::CloseMediaRouterDialog() {
+void MediaRouterDialogControllerImpl::CloseMediaRouterDialog() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(initiator_observer_.get());
   WebContents* media_router_dialog = GetMediaRouterDialog();
   CHECK(media_router_dialog);
   Reset();
 
   content::WebUI* web_ui = media_router_dialog->GetWebUI();
   if (web_ui) {
     MediaRouterUI* media_router_ui =
         static_cast<MediaRouterUI*>(web_ui->GetController());
     if (media_router_ui)
       media_router_ui->Close();
   }
 }
 
-void MediaRouterDialogController::CreateMediaRouterDialog() {
+void MediaRouterDialogControllerImpl::CreateMediaRouterDialog() {
   DCHECK(!initiator_observer_.get());
   DCHECK(!dialog_observer_.get());
 
   Profile* profile =
       Profile::FromBrowserContext(initiator_->GetBrowserContext());
   DCHECK(profile);
 
   WebDialogDelegate* web_dialog_delegate = new MediaRouterDialogDelegate;
 
   // |web_dialog_delegate|'s owner is |constrained_delegate|.
@@ skipping 20 matching lines @@
   WebContents* media_router_dialog = constrained_delegate->GetWebContents();
 
   media_router_dialog_pending_ = true;
 
   initiator_observer_.reset(new InitiatorWebContentsObserver(
       initiator_, this));
   dialog_observer_.reset(new DialogWebContentsObserver(
       media_router_dialog, this));
 }
 
-void MediaRouterDialogController::Reset() {
+void MediaRouterDialogControllerImpl::Reset() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(initiator_observer_.get());
   DCHECK(dialog_observer_.get());
   initiator_observer_.reset();
   dialog_observer_.reset();
   presentation_request_.reset();
 }
 
-void MediaRouterDialogController::OnDialogNavigated(
+void MediaRouterDialogControllerImpl::OnDialogNavigated(
     const content::LoadCommittedDetails& details) {
   DCHECK(thread_checker_.CalledOnValidThread());
   WebContents* media_router_dialog = GetMediaRouterDialog();
   CHECK(media_router_dialog);
   ui::PageTransition transition_type = details.entry->GetTransitionType();
   content::NavigationType nav_type = details.type;
 
   // New |media_router_dialog| is created.
   DCHECK(media_router_dialog_pending_);
   DCHECK(transition_type == ui::PAGE_TRANSITION_AUTO_TOPLEVEL &&
       nav_type == content::NAVIGATION_TYPE_NEW_PAGE)
       << "transition_type: " << transition_type << ", "
       << "nav_type: " << nav_type;
 
   media_router_dialog_pending_ = false;
 
   PopulateDialog(media_router_dialog);
 }
 
-void MediaRouterDialogController::PopulateDialog(
+void MediaRouterDialogControllerImpl::PopulateDialog(
     content::WebContents* media_router_dialog) {
   DCHECK(media_router_dialog);
   DCHECK(initiator_observer_);
   if (!initiator_observer_) {
     Reset();
     return;
   }
   content::WebContents* initiator = initiator_observer_->web_contents();
   DCHECK(initiator);
   if (!initiator || !media_router_dialog->GetWebUI()) {
@@ skipping 16 matching lines @@
     CHECK(delegate);
     media_router_ui->InitWithDefaultMediaSource(delegate);
   } else {
     media_router_ui->InitWithPresentationSessionRequest(
         initiator, presentation_request_.Pass());
   }
 }
 
 }  // namespace media_router