| OLD | NEW |
| 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/ui/media_stream_infobar_delegate.h" | 5 #include "chrome/browser/ui/media_stream_infobar_delegate.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "chrome/browser/infobars/infobar_tab_helper.h" | 8 #include "chrome/browser/infobars/infobar_tab_helper.h" |
| 9 #include "googleurl/src/gurl.h" | 9 #include "googleurl/src/gurl.h" |
| 10 #include "grit/theme_resources.h" | 10 #include "grit/theme_resources.h" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 content::MediaStreamDevices | 31 content::MediaStreamDevices |
| 32 MediaStreamInfoBarDelegate::GetAudioDevices() const { | 32 MediaStreamInfoBarDelegate::GetAudioDevices() const { |
| 33 return controller_->GetAudioDevices(); | 33 return controller_->GetAudioDevices(); |
| 34 } | 34 } |
| 35 | 35 |
| 36 content::MediaStreamDevices | 36 content::MediaStreamDevices |
| 37 MediaStreamInfoBarDelegate::GetVideoDevices() const { | 37 MediaStreamInfoBarDelegate::GetVideoDevices() const { |
| 38 return controller_->GetVideoDevices(); | 38 return controller_->GetVideoDevices(); |
| 39 } | 39 } |
| 40 | 40 |
| 41 const GURL& MediaStreamInfoBarDelegate::GetSecurityOrigin() const { | 41 const std::string& MediaStreamInfoBarDelegate::GetSecurityOriginSpec() const { |
| 42 return controller_->GetSecurityOrigin(); | 42 return controller_->GetSecurityOriginSpec(); |
| 43 } |
| 44 |
| 45 bool MediaStreamInfoBarDelegate::IsSafeToAlwaysAllowAudio() const { |
| 46 return controller_->IsSafeToAlwaysAllowAudio(); |
| 47 } |
| 48 |
| 49 bool MediaStreamInfoBarDelegate::IsSafeToAlwaysAllowVideo() const { |
| 50 return controller_->IsSafeToAlwaysAllowVideo(); |
| 43 } | 51 } |
| 44 | 52 |
| 45 void MediaStreamInfoBarDelegate::Accept(const std::string& audio_id, | 53 void MediaStreamInfoBarDelegate::Accept(const std::string& audio_id, |
| 46 const std::string& video_id, | 54 const std::string& video_id, |
| 47 bool always_allow) { | 55 bool always_allow) { |
| 48 controller_->Accept(audio_id, video_id, always_allow); | 56 controller_->Accept(audio_id, video_id, always_allow); |
| 49 } | 57 } |
| 50 | 58 |
| 51 void MediaStreamInfoBarDelegate::Deny() { | 59 void MediaStreamInfoBarDelegate::Deny() { |
| 52 controller_->Deny(); | 60 controller_->Deny(); |
| (...skipping 14 matching lines...) Expand all Loading... |
| 67 } | 75 } |
| 68 | 76 |
| 69 InfoBarDelegate::Type MediaStreamInfoBarDelegate::GetInfoBarType() const { | 77 InfoBarDelegate::Type MediaStreamInfoBarDelegate::GetInfoBarType() const { |
| 70 return PAGE_ACTION_TYPE; | 78 return PAGE_ACTION_TYPE; |
| 71 } | 79 } |
| 72 | 80 |
| 73 MediaStreamInfoBarDelegate* | 81 MediaStreamInfoBarDelegate* |
| 74 MediaStreamInfoBarDelegate::AsMediaStreamInfoBarDelegate() { | 82 MediaStreamInfoBarDelegate::AsMediaStreamInfoBarDelegate() { |
| 75 return this; | 83 return this; |
| 76 } | 84 } |
| OLD | NEW |