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

Side by Side Diff: chrome/browser/media/webrtc/media_stream_infobar_delegate_android.cc

Issue 2493013002: Replace the use of WindowAndroid with Tab in permissions code. (Closed)
Patch Set: Comments Created 4 years, 1 month 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "chrome/browser/media/webrtc/media_stream_infobar_delegate_android.h" 5 #include "chrome/browser/media/webrtc/media_stream_infobar_delegate_android.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 } 191 }
192 192
193 base::string16 MediaStreamInfoBarDelegateAndroid::GetLinkText() const { 193 base::string16 MediaStreamInfoBarDelegateAndroid::GetLinkText() const {
194 return base::string16(); 194 return base::string16();
195 } 195 }
196 196
197 GURL MediaStreamInfoBarDelegateAndroid::GetLinkURL() const { 197 GURL MediaStreamInfoBarDelegateAndroid::GetLinkURL() const {
198 return GURL(chrome::kMediaAccessLearnMoreUrl); 198 return GURL(chrome::kMediaAccessLearnMoreUrl);
199 } 199 }
200 200
201 std::vector<int> MediaStreamInfoBarDelegateAndroid::content_settings() const { 201 std::vector<int> MediaStreamInfoBarDelegateAndroid::content_settings_types()
202 const {
202 std::vector<int> types; 203 std::vector<int> types;
203 if (controller_->IsAskingForAudio()) 204 if (controller_->IsAskingForAudio())
204 types.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC); 205 types.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
205 if (controller_->IsAskingForVideo()) 206 if (controller_->IsAskingForVideo())
206 types.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA); 207 types.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
207 return types; 208 return types;
208 } 209 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698