Skip to content

GitLab

T
tangled
Commit 6d7a1ad1 authored by Muyao Xu's avatar Muyao Xu Committed by Commit Bot
Browse files
Options

Move MediaRouterViewsUI out of the chrome/browser/ui/view/ directory 

MediaRouterViewsUI is not dependent on ui/views/view.h and can be moved
to c/b/u/ directory. Also renamed the class to MediaRouterUI.

Bug: 1116045
Change-Id: I222f5b194b7e707602feb53221ba9e6ec8b35a8f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2354414
Commit-Queue: Muyao Xu <muyaoxu@google.com>
Reviewed-by: default avatarScott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#801468}
parent 2dfa8cd8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 107 additions and 111 deletions
chrome/browser/ui/BUILD.gn
View file @ 6d7a1ad1
......@@ -1044,6 +1044,8 @@ static_library("ui") {
"media_router/media_cast_mode.h",
"media_router/media_router_file_dialog.cc",
"media_router/media_router_file_dialog.h",
"media_router/media_router_ui.cc",
"media_router/media_router_ui.h",
"media_router/media_router_ui_helper.cc",
"media_router/media_router_ui_helper.h",
"media_router/media_router_ui_service.cc",
......@@ -3600,8 +3602,6 @@ static_library("ui") {
"views/media_router/media_remoting_dialog_view.h",
"views/media_router/media_router_dialog_controller_views.cc",
"views/media_router/media_router_dialog_controller_views.h",
"views/media_router/media_router_views_ui.cc",
"views/media_router/media_router_views_ui.h",
"views/media_router/presentation_receiver_window_factory.cc",
"views/media_router/presentation_receiver_window_frame.cc",
"views/media_router/presentation_receiver_window_frame.h",
......
chrome/browser/ui/views/media_router/media_router_views_ui.h → chrome/browser/ui/media_router/media_router_ui.h
View file @ 6d7a1ad1
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_UI_VIEWS_MEDIA_ROUTER_MEDIA_ROUTER_VIEWS_UI_H_
#define CHROME_BROWSER_UI_VIEWS_MEDIA_ROUTER_MEDIA_ROUTER_VIEWS_UI_H_
#ifndef CHROME_BROWSER_UI_MEDIA_ROUTER_MEDIA_ROUTER_UI_H_
#define CHROME_BROWSER_UI_MEDIA_ROUTER_MEDIA_ROUTER_UI_H_
#include <memory>
#include <set>
......@@ -50,14 +50,14 @@ class MediaSink;
class RouteRequestResult;
// Functions as an intermediary between MediaRouter and Views Cast dialog.
class MediaRouterViewsUI
class MediaRouterUI
: public CastDialogController,
public QueryResultManager::Observer,
public WebContentsPresentationManager::Observer,
public MediaRouterFileDialog::MediaRouterFileDialogDelegate {
public:
explicit MediaRouterViewsUI(content::WebContents* initiator);
~MediaRouterViewsUI() override;
explicit MediaRouterUI(content::WebContents* initiator);
~MediaRouterUI() override;
// CastDialogController:
void AddObserver(CastDialogController::Observer* observer) override;
......@@ -173,7 +173,7 @@ class MediaRouterViewsUI
// updated.
class UiIssuesObserver : public IssuesObserver {
public:
UiIssuesObserver(IssueManager* issue_manager, MediaRouterViewsUI* ui);
UiIssuesObserver(IssueManager* issue_manager, MediaRouterUI* ui);
~UiIssuesObserver() override;
// IssuesObserver:
......@@ -181,8 +181,8 @@ class MediaRouterViewsUI
void OnIssuesCleared() override;
private:
// Reference back to the owning MediaRouterViewsUI instance.
MediaRouterViewsUI* const ui_;
// Reference back to the owning MediaRouterUI instance.
MediaRouterUI* const ui_;
DISALLOW_COPY_AND_ASSIGN(UiIssuesObserver);
};
......@@ -203,7 +203,7 @@ class MediaRouterViewsUI
const std::vector<MediaRoute::Id>& joinable_route_ids) override;
private:
// Callback to the owning MediaRouterViewsUI instance.
// Callback to the owning MediaRouterUI instance.
RoutesUpdatedCallback callback_;
DISALLOW_COPY_AND_ASSIGN(UIMediaRoutesObserver);
......@@ -418,11 +418,11 @@ class MediaRouterViewsUI
// NOTE: Weak pointers must be invalidated before all other member variables.
// Therefore |weak_factory_| must be placed at the end.
base::WeakPtrFactory<MediaRouterViewsUI> weak_factory_{this};
base::WeakPtrFactory<MediaRouterUI> weak_factory_{this};
DISALLOW_COPY_AND_ASSIGN(MediaRouterViewsUI);
DISALLOW_COPY_AND_ASSIGN(MediaRouterUI);
};
} // namespace media_router
#endif // CHROME_BROWSER_UI_VIEWS_MEDIA_ROUTER_MEDIA_ROUTER_VIEWS_UI_H_
#endif // CHROME_BROWSER_UI_MEDIA_ROUTER_MEDIA_ROUTER_UI_H_
chrome/browser/ui/views/media_router/media_router_views_ui_unittest.cc → chrome/browser/ui/media_router/media_router_ui_unittest.cc
View file @ 6d7a1ad1
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/ui/views/media_router/media_router_views_ui.h"
#include "chrome/browser/ui/media_router/media_router_ui.h"
#include <initializer_list>
#include <memory>
......@@ -152,7 +152,7 @@ class MediaRouterViewsUITest : public ChromeRenderViewHostTestHarness {
ON_CALL(*mock_router_, GetLogger()).WillByDefault(Return(logger_.get()));
CreateSessionServiceTabHelper(web_contents());
ui_ = std::make_unique<MediaRouterViewsUI>(web_contents());
ui_ = std::make_unique<MediaRouterUI>(web_contents());
ui_->InitWithDefaultMediaSource();
}
......@@ -172,7 +172,7 @@ class MediaRouterViewsUITest : public ChromeRenderViewHostTestHarness {
content::RenderFrameHostTester::CommitPendingLoad(
&web_contents()->GetController());
CreateSessionServiceTabHelper(web_contents());
ui_ = std::make_unique<MediaRouterViewsUI>(web_contents());
ui_ = std::make_unique<MediaRouterUI>(web_contents());
ui_->InitWithDefaultMediaSource();
}
......@@ -251,7 +251,7 @@ class MediaRouterViewsUITest : public ChromeRenderViewHostTestHarness {
protected:
std::vector<MediaSinksObserver*> media_sinks_observers_;
MockMediaRouter* mock_router_ = nullptr;
std::unique_ptr<MediaRouterViewsUI> ui_;
std::unique_ptr<MediaRouterUI> ui_;
std::unique_ptr<StartPresentationContext> start_presentation_context_;
std::unique_ptr<LoggerImpl> logger_;
content::PresentationRequest presentation_request_{
......
chrome/browser/ui/views/media_router/media_router_dialog_controller_views.cc
View file @ 6d7a1ad1
......@@ -11,6 +11,7 @@
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/global_media_controls/media_notification_service.h"
#include "chrome/browser/ui/global_media_controls/media_notification_service_factory.h"
#include "chrome/browser/ui/media_router/media_router_ui.h"
#include "chrome/browser/ui/views/frame/browser_view.h"
#include "chrome/browser/ui/views/frame/top_container_view.h"
#include "chrome/browser/ui/views/global_media_controls/media_dialog_view.h"
......@@ -162,7 +163,7 @@ void MediaRouterDialogControllerViews::OnServiceDisabled() {
}
void MediaRouterDialogControllerViews::InitializeMediaRouterUI() {
ui_ = std::make_unique<MediaRouterViewsUI>(initiator());
ui_ = std::make_unique<MediaRouterUI>(initiator());
if (start_presentation_context_) {
ui_->InitWithStartPresentationContext(
std::move(start_presentation_context_));
......
chrome/browser/ui/views/media_router/media_router_dialog_controller_views.h
View file @ 6d7a1ad1
......@@ -12,12 +12,13 @@
#include "base/scoped_observer.h"
#include "chrome/browser/media/router/media_router_dialog_controller.h"
#include "chrome/browser/ui/media_router/media_router_ui_service.h"
#include "chrome/browser/ui/views/media_router/media_router_views_ui.h"
#include "ui/views/widget/widget.h"
#include "ui/views/widget/widget_observer.h"
namespace media_router {
class MediaRouterUI;
// A Views implementation of MediaRouterDialogController.
class MediaRouterDialogControllerViews
: public content::WebContentsUserData<MediaRouterDialogControllerViews>,
......@@ -60,13 +61,13 @@ class MediaRouterDialogControllerViews
// toolbar action. It's owned by MediaRouterUIService and it may be nullptr.
MediaRouterActionController* GetActionController();
MediaRouterViewsUI* ui() { return ui_.get(); }
MediaRouterUI* ui() { return ui_.get(); }
// Responsible for notifying the dialog view of dialog model updates and
// sending route requests to MediaRouter. Set to nullptr when the dialog is
// closed. Not used for presentation requests when
// closed. Not used for presentation requests when
// GlobalMediaControlsCastStartStopEnabled() returns true.
std::unique_ptr<MediaRouterViewsUI> ui_;
std::unique_ptr<MediaRouterUI> ui_;
base::RepeatingClosure dialog_creation_callback_;
......
chrome/test/BUILD.gn
View file @ 6d7a1ad1
......@@ -5611,6 +5611,7 @@ test("unit_tests") {
sources += [
"../../ui/views/controls/webview/web_dialog_view_unittest.cc",
"../../ui/views/controls/webview/webview_unittest.cc",
"../browser/ui/media_router/media_router_ui_unittest.cc",
"../browser/ui/views/accelerator_table_unittest.cc",
"../browser/ui/views/accelerator_table_unittest_mac.mm",
"../browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc",
......@@ -5659,7 +5660,6 @@ test("unit_tests") {
"../browser/ui/views/media_router/cast_dialog_view_unittest.cc",
"../browser/ui/views/media_router/cast_toolbar_button_unittest.cc",
"../browser/ui/views/media_router/cloud_services_dialog_view_unittest.cc",
"../browser/ui/views/media_router/media_router_views_ui_unittest.cc",
"../browser/ui/views/media_router/web_contents_display_observer_view_unittest.cc",
"../browser/ui/views/omnibox/omnibox_result_view_unittest.cc",
"../browser/ui/views/omnibox/omnibox_view_views_unittest.cc",
......
chrome/test/media_router/media_router_ui_for_test.cc
View file @ 6d7a1ad1
......@@ -10,6 +10,7 @@
#include "chrome/browser/media/router/media_router_factory.h"
#include "chrome/browser/media/router/media_routes_observer.h"
#include "chrome/browser/ui/media_router/media_router_file_dialog.h"
#include "chrome/browser/ui/media_router/media_router_ui.h"
#include "chrome/browser/ui/views/media_router/cast_dialog_sink_button.h"
#include "chrome/browser/ui/views/media_router/cast_dialog_view.h"
#include "chrome/browser/ui/views/media_router/media_router_dialog_controller_views.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment