Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4423)

Unified Diff: chrome/browser/ui/webui/media_router/media_router_webui_message_handler.h

Issue 2862513002: Revert of [Media Router] Custom Controls 3 - add plumbing through MRUI and MRWebUIMessageHandler (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/media_router/media_router_webui_message_handler.h
diff --git a/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.h b/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.h
index db769a506d7ead8a35ad67f863151792c41eec4a..33a005be35870ac6a280e55c3c146faba172a787 100644
--- a/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.h
+++ b/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.h
@@ -12,7 +12,6 @@
#include "chrome/browser/ui/webui/media_router/media_cast_mode.h"
#include "chrome/browser/ui/webui/media_router/media_sink_with_cast_modes.h"
#include "chrome/common/media_router/issue.h"
-#include "chrome/common/media_router/media_status.h"
#include "components/signin/core/browser/account_info.h"
#include "content/public/browser/web_ui_message_handler.h"
#include "ui/gfx/geometry/size.h"
@@ -57,13 +56,6 @@
// the browser window changes.
void UpdateMaxDialogHeight(int height);
- // Notifies the WebUI with an updated MediaStatus. Overridden in tests.
- virtual void UpdateMediaRouteStatus(const MediaStatus& status);
-
- // Notifies the WebUI that the controller for the selected route has been
- // invalidated.
- void OnRouteControllerInvalidated();
-
void SetWebUIForTest(content::WebUI* webui);
void set_incognito_for_test(bool incognito) { incognito_ = incognito; }
@@ -72,12 +64,6 @@
RecordCastModeSelection);
FRIEND_TEST_ALL_PREFIXES(MediaRouterWebUIMessageHandlerTest,
RetrieveCastModeSelection);
- FRIEND_TEST_ALL_PREFIXES(MediaRouterWebUIMessageHandlerTest,
- OnRouteDetailsOpenedAndClosed);
- FRIEND_TEST_ALL_PREFIXES(MediaRouterWebUIMessageHandlerTest,
- OnMediaCommandsReceived);
- FRIEND_TEST_ALL_PREFIXES(MediaRouterWebUIMessageHandlerTest,
- OnInvalidMediaCommandsReceived);
// WebUIMessageHandler implementation.
void RegisterMessages() override;
@@ -103,17 +89,8 @@
void OnReportSinkCount(const base::ListValue* args);
void OnReportTimeToClickSink(const base::ListValue* args);
void OnReportTimeToInitialActionClose(const base::ListValue* args);
- void OnMediaControllerAvailable(const base::ListValue* args);
- void OnMediaControllerClosed(const base::ListValue* args);
void OnSearchSinksAndCreateRoute(const base::ListValue* args);
void OnInitialDataReceived(const base::ListValue* args);
-
- // Handlers for JavaScript messages to control the media.
- void OnPlayCurrentMedia(const base::ListValue* args);
- void OnPauseCurrentMedia(const base::ListValue* args);
- void OnSeekCurrentMedia(const base::ListValue* args);
- void OnSetCurrentMediaMute(const base::ListValue* args);
- void OnSetCurrentMediaVolume(const base::ListValue* args);
// Performs an action for an Issue of |type|.
// |args| contains additional parameter that varies based on |type|.
@@ -152,9 +129,6 @@
// Keeps track of whether a command to close the dialog has been issued.
bool dialog_closing_;
- // The media status currently shown in the UI.
- base::Optional<MediaStatus> current_media_status_;
-
MediaRouterUI* media_router_ui_;
DISALLOW_COPY_AND_ASSIGN(MediaRouterWebUIMessageHandler);

Powered by Google App Engine
This is Rietveld 408576698