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

Side by Side Diff: chrome/browser/media/android/router/media_router_dialog_controller_android.h

Issue 1415103006: Non-Local Join for Media Router and Presentation API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review Fixes 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_DIALOG_CONTROLLER_ANDRO ID_H_ 5 #ifndef CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_DIALOG_CONTROLLER_ANDRO ID_H_
6 #define CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_DIALOG_CONTROLLER_ANDRO ID_H_ 6 #define CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_DIALOG_CONTROLLER_ANDRO ID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "base/android/scoped_java_ref.h" 10 #include "base/android/scoped_java_ref.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 // Use MediaRouterDialogControllerAndroid::CreateForWebContents() to create an 45 // Use MediaRouterDialogControllerAndroid::CreateForWebContents() to create an
46 // instance. 46 // instance.
47 explicit MediaRouterDialogControllerAndroid( 47 explicit MediaRouterDialogControllerAndroid(
48 content::WebContents* web_contents); 48 content::WebContents* web_contents);
49 49
50 // MediaRouterDialogController: 50 // MediaRouterDialogController:
51 void CreateMediaRouterDialog() override; 51 void CreateMediaRouterDialog() override;
52 void CloseMediaRouterDialog() override; 52 void CloseMediaRouterDialog() override;
53 bool IsShowingMediaRouterDialog() const override; 53 bool IsShowingMediaRouterDialog() const override;
54 54
55 // MediaRoutesObserver: 55 void OnRoutesUpdated(
56 void OnRoutesUpdated(const std::vector<MediaRoute>& routes) override; 56 const std::vector<MediaRoute>& routes,
57 const std::vector<MediaRoute::Id>& joinable_route_ids) override;
57 58
58 void CancelPresentationRequest(); 59 void CancelPresentationRequest();
59 60
60 base::android::ScopedJavaGlobalRef<jobject> java_dialog_controller_; 61 base::android::ScopedJavaGlobalRef<jobject> java_dialog_controller_;
61 62
62 // Null if no routes or more than one route exist. If there's only one route, 63 // Null if no routes or more than one route exist. If there's only one route,
63 // keeps a copy to determine if the route controller dialog needs to be shown 64 // keeps a copy to determine if the route controller dialog needs to be shown
64 // vs. the route chooser one. 65 // vs. the route chooser one.
65 scoped_ptr<MediaRoute> single_existing_route_; 66 scoped_ptr<MediaRoute> single_existing_route_;
66 67
67 DISALLOW_COPY_AND_ASSIGN(MediaRouterDialogControllerAndroid); 68 DISALLOW_COPY_AND_ASSIGN(MediaRouterDialogControllerAndroid);
68 }; 69 };
69 70
70 } // namespace media_router 71 } // namespace media_router
71 72
72 #endif // CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_DIALOG_CONTROLLER_AN DROID_H_ 73 #endif // CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_DIALOG_CONTROLLER_AN DROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698