| Index: chrome/browser/ui/webui/media_router/media_router_dialog_controller.cc
|
| diff --git a/chrome/browser/ui/webui/media_router/media_router_dialog_controller.cc b/chrome/browser/ui/webui/media_router/media_router_dialog_controller.cc
|
| deleted file mode 100644
|
| index 816edc91e348506eb380d69b6c4e5a20e5504336..0000000000000000000000000000000000000000
|
| --- a/chrome/browser/ui/webui/media_router/media_router_dialog_controller.cc
|
| +++ /dev/null
|
| @@ -1,358 +0,0 @@
|
| -// 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 <string>
|
| -#include <vector>
|
| -
|
| -#include "chrome/browser/media/router/presentation_service_delegate_impl.h"
|
| -#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);
|
| -
|
| -using content::LoadCommittedDetails;
|
| -using content::NavigationController;
|
| -using content::WebContents;
|
| -using content::WebUIMessageHandler;
|
| -using ui::WebDialogDelegate;
|
| -
|
| -namespace {
|
| -const int kMaxHeight = 260;
|
| -#if !defined(OS_MACOSX)
|
| -const int kMinHeight = 130;
|
| -#endif // !defined(OS_MACOSX)
|
| -const int kWidth = 340;
|
| -}
|
| -
|
| -namespace media_router {
|
| -
|
| -namespace {
|
| -
|
| -// WebDialogDelegate that specifies what the media router dialog
|
| -// will look like.
|
| -class MediaRouterDialogDelegate : public WebDialogDelegate {
|
| - public:
|
| - MediaRouterDialogDelegate() {}
|
| - ~MediaRouterDialogDelegate() override {}
|
| -
|
| - // WebDialogDelegate implementation.
|
| - ui::ModalType GetDialogModalType() const override {
|
| - // Not used, returning dummy value.
|
| - return ui::MODAL_TYPE_WINDOW;
|
| - }
|
| -
|
| - base::string16 GetDialogTitle() const override {
|
| - return base::string16();
|
| - }
|
| -
|
| - GURL GetDialogContentURL() const override {
|
| - return GURL(chrome::kChromeUIMediaRouterURL);
|
| - }
|
| -
|
| - void GetWebUIMessageHandlers(
|
| - std::vector<WebUIMessageHandler*>* handlers) const override {
|
| - // MediaRouterUI adds its own message handlers.
|
| - }
|
| -
|
| - void GetDialogSize(gfx::Size* size) const override;
|
| -
|
| - std::string GetDialogArgs() const override {
|
| - return std::string();
|
| - }
|
| -
|
| - void OnDialogClosed(const std::string& json_retval) override {
|
| - // We don't delete |this| here because this class is owned
|
| - // by ConstrainedWebDialogDelegate.
|
| - }
|
| -
|
| - void OnCloseContents(WebContents* source, bool* out_close_dialog) override {
|
| - if (out_close_dialog)
|
| - *out_close_dialog = true;
|
| - }
|
| -
|
| - bool ShouldShowDialogTitle() const override {
|
| - return false;
|
| - }
|
| -
|
| - private:
|
| - DISALLOW_COPY_AND_ASSIGN(MediaRouterDialogDelegate);
|
| -};
|
| -
|
| -void MediaRouterDialogDelegate::GetDialogSize(gfx::Size* size) const {
|
| - DCHECK(size);
|
| - // TODO(apacible): Remove after autoresizing is implemented for OSX.
|
| -#if defined(OS_MACOSX)
|
| - *size = gfx::Size(kWidth, kMaxHeight);
|
| -#else
|
| - // size is not used because the dialog is auto-resizeable.
|
| - *size = gfx::Size();
|
| -#endif
|
| -}
|
| -
|
| -} // namespace
|
| -
|
| -// static
|
| -MediaRouterDialogController*
|
| -MediaRouterDialogController::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);
|
| -}
|
| -
|
| -class MediaRouterDialogController::DialogWebContentsObserver
|
| - : public content::WebContentsObserver {
|
| - public:
|
| - DialogWebContentsObserver(
|
| - WebContents* web_contents,
|
| - MediaRouterDialogController* 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_;
|
| -};
|
| -
|
| -class MediaRouterDialogController::InitiatorWebContentsObserver
|
| - : public content::WebContentsObserver {
|
| - public:
|
| - InitiatorWebContentsObserver(
|
| - WebContents* web_contents,
|
| - MediaRouterDialogController* 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_;
|
| -};
|
| -
|
| -MediaRouterDialogController::MediaRouterDialogController(
|
| - WebContents* web_contents)
|
| - : initiator_(web_contents),
|
| - media_router_dialog_pending_(false) {
|
| - DCHECK(initiator_);
|
| - DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
|
| -}
|
| -
|
| -MediaRouterDialogController::~MediaRouterDialogController() {
|
| - DCHECK(thread_checker_.CalledOnValidThread());
|
| -}
|
| -
|
| -WebContents* MediaRouterDialogController::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(
|
| - scoped_ptr<CreatePresentationSessionRequest> 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;
|
| - }
|
| -
|
| - // Show the initiator holding the existing media router dialog.
|
| - initiator_->GetDelegate()->ActivateContents(initiator_);
|
| - return nullptr;
|
| -}
|
| -
|
| -WebContents* MediaRouterDialogController::GetMediaRouterDialog() const {
|
| - DCHECK(thread_checker_.CalledOnValidThread());
|
| - return dialog_observer_.get() ? dialog_observer_->web_contents() : nullptr;
|
| -}
|
| -
|
| -void MediaRouterDialogController::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() {
|
| - 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|.
|
| - // |constrained_delegate| is owned by the parent |views::View|.
|
| - // TODO(apacible): Remove after autoresizing is implemented for OSX.
|
| -#if defined(OS_MACOSX)
|
| - ConstrainedWebDialogDelegate* constrained_delegate =
|
| - ShowConstrainedWebDialog(profile, web_dialog_delegate, initiator_);
|
| -#else
|
| - // TODO(apacible): Adjust min and max sizes based on new WebUI design.
|
| - gfx::Size min_size = gfx::Size(kWidth, kMinHeight);
|
| - gfx::Size max_size = gfx::Size(kWidth, kMaxHeight);
|
| -
|
| - // |ShowConstrainedWebDialogWithAutoResize()| will end up creating
|
| - // ConstrainedWebDialogDelegateViewViews containing a WebContents containing
|
| - // the MediaRouterUI, using the provided |web_dialog_delegate|. Then, the
|
| - // view is shown as a modal dialog constrained to the |initiator| WebContents.
|
| - // The dialog will resize between the |min_size| and |max_size| bounds based
|
| - // on the currently rendered contents.
|
| - ConstrainedWebDialogDelegate* constrained_delegate =
|
| - ShowConstrainedWebDialogWithAutoResize(
|
| - profile, web_dialog_delegate, initiator_, min_size, max_size);
|
| -#endif
|
| -
|
| - 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() {
|
| - DCHECK(thread_checker_.CalledOnValidThread());
|
| - DCHECK(initiator_observer_.get());
|
| - DCHECK(dialog_observer_.get());
|
| - initiator_observer_.reset();
|
| - dialog_observer_.reset();
|
| - presentation_request_.reset();
|
| -}
|
| -
|
| -void MediaRouterDialogController::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(
|
| - 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()) {
|
| - Reset();
|
| - return;
|
| - }
|
| -
|
| - MediaRouterUI* media_router_ui = static_cast<MediaRouterUI*>(
|
| - media_router_dialog->GetWebUI()->GetController());
|
| - DCHECK(media_router_ui);
|
| - if (!media_router_ui) {
|
| - Reset();
|
| - return;
|
| - }
|
| -
|
| - if (!presentation_request_.get()) {
|
| - // TODO(imcheng): Don't create PresentationServiceDelegateImpl if it doesn't
|
| - // exist (crbug.com/508695).
|
| - base::WeakPtr<PresentationServiceDelegateImpl> delegate =
|
| - PresentationServiceDelegateImpl::GetOrCreateForWebContents(initiator)
|
| - ->GetWeakPtr();
|
| - media_router_ui->InitWithDefaultMediaSource(delegate);
|
| - } else {
|
| - media_router_ui->InitWithPresentationSessionRequest(
|
| - initiator, presentation_request_.Pass());
|
| - }
|
| -}
|
| -
|
| -} // namespace media_router
|
| -
|
|
|