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

Unified Diff: chrome/browser/media/android/router/media_router_dialog_controller_android.h

Issue 1527353003: [Cast, Android, Presentation API] Fix the logic for showing controller vs chooser dialog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2564
Patch Set: Created 5 years 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/media/android/router/media_router_dialog_controller_android.h
diff --git a/chrome/browser/media/android/router/media_router_dialog_controller_android.h b/chrome/browser/media/android/router/media_router_dialog_controller_android.h
index cbd5928ad93966e06c240297012dd53ff9544eea..c066a05cc548c042db6fe9724e7dabc4a2bb4bcc 100644
--- a/chrome/browser/media/android/router/media_router_dialog_controller_android.h
+++ b/chrome/browser/media/android/router/media_router_dialog_controller_android.h
@@ -11,7 +11,6 @@
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/media/router/media_router_dialog_controller.h"
-#include "chrome/browser/media/router/media_routes_observer.h"
#include "content/public/browser/web_contents_user_data.h"
namespace media_router {
@@ -19,8 +18,7 @@ namespace media_router {
// Android implementation of the MediaRouterDialogController.
class MediaRouterDialogControllerAndroid
: public content::WebContentsUserData<MediaRouterDialogControllerAndroid>,
- public MediaRouterDialogController,
- public MediaRoutesObserver {
+ public MediaRouterDialogController {
public:
~MediaRouterDialogControllerAndroid() override;
@@ -52,18 +50,10 @@ class MediaRouterDialogControllerAndroid
void CloseMediaRouterDialog() override;
bool IsShowingMediaRouterDialog() const override;
- // MediaRoutesObserver:
- void OnRoutesUpdated(const std::vector<MediaRoute>& routes) override;
-
void CancelPresentationRequest();
base::android::ScopedJavaGlobalRef<jobject> java_dialog_controller_;
- // Null if no routes or more than one route exist. If there's only one route,
- // keeps a copy to determine if the route controller dialog needs to be shown
- // vs. the route chooser one.
- scoped_ptr<MediaRoute> single_existing_route_;
-
DISALLOW_COPY_AND_ASSIGN(MediaRouterDialogControllerAndroid);
};

Powered by Google App Engine
This is Rietveld 408576698