| 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 <algorithm> | 5 #include <algorithm> |
| 6 #include <functional> | 6 #include <functional> |
| 7 | 7 |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "chrome/browser/ui/media_stream_infobar_delegate.h" | 9 #include "chrome/browser/ui/media_stream_infobar_delegate.h" |
| 10 #include "content/public/common/media_stream_request.h" | 10 #include "content/public/common/media_stream_request.h" |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 content::MediaStreamDevices::const_iterator it = std::find_if( | 103 content::MediaStreamDevices::const_iterator it = std::find_if( |
| 104 device_it->second.begin(), device_it->second.end(), DeviceIdEquals(id)); | 104 device_it->second.begin(), device_it->second.end(), DeviceIdEquals(id)); |
| 105 if (it != device_it->second.end()) | 105 if (it != device_it->second.end()) |
| 106 devices->push_back(*it); | 106 devices->push_back(*it); |
| 107 } | 107 } |
| 108 } | 108 } |
| 109 | 109 |
| 110 // MediaStreamInfoBarDelegate::CreateInfoBar is implemented in platform-specific | 110 // MediaStreamInfoBarDelegate::CreateInfoBar is implemented in platform-specific |
| 111 // files. | 111 // files. |
| 112 | 112 |
| 113 #if defined(OS_MAC) | 113 #if defined(OS_MACOSX) |
| 114 // TODO(macourteau): This section is temporary, until the InfoBar is implemented | 114 // TODO(macourteau): This section is temporary, until the InfoBar is implemented |
| 115 // on MacOS, to make sure everything compiles and links. | 115 // on MacOS, to make sure everything compiles and links. |
| 116 InfoBar* MediaStreamInfoBarDelegate::CreateInfoBar(InfoBarTabHelper* owner) { | 116 InfoBar* MediaStreamInfoBarDelegate::CreateInfoBar(InfoBarTabHelper* owner) { |
| 117 DCHECK(owner); | 117 DCHECK(owner); |
| 118 return NULL; | 118 return NULL; |
| 119 } | 119 } |
| 120 #endif // OS_MAC | 120 #endif // OS_MACOSX |
| 121 | 121 |
| 122 void MediaStreamInfoBarDelegate::InfoBarDismissed() { | 122 void MediaStreamInfoBarDelegate::InfoBarDismissed() { |
| 123 // Deny the request if the infobar was closed with the 'x' button, since | 123 // Deny the request if the infobar was closed with the 'x' button, since |
| 124 // we don't want WebRTC to be waiting for an answer that will never come. | 124 // we don't want WebRTC to be waiting for an answer that will never come. |
| 125 Deny(); | 125 Deny(); |
| 126 } | 126 } |
| 127 | 127 |
| 128 gfx::Image* MediaStreamInfoBarDelegate::GetIcon() const { | 128 gfx::Image* MediaStreamInfoBarDelegate::GetIcon() const { |
| 129 return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(has_video_ ? | 129 return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(has_video_ ? |
| 130 IDR_INFOBAR_MEDIA_STREAM_CAMERA : IDR_INFOBAR_MEDIA_STREAM_MIC); | 130 IDR_INFOBAR_MEDIA_STREAM_CAMERA : IDR_INFOBAR_MEDIA_STREAM_MIC); |
| 131 } | 131 } |
| 132 | 132 |
| 133 InfoBarDelegate::Type MediaStreamInfoBarDelegate::GetInfoBarType() const { | 133 InfoBarDelegate::Type MediaStreamInfoBarDelegate::GetInfoBarType() const { |
| 134 return PAGE_ACTION_TYPE; | 134 return PAGE_ACTION_TYPE; |
| 135 } | 135 } |
| 136 | 136 |
| 137 MediaStreamInfoBarDelegate* | 137 MediaStreamInfoBarDelegate* |
| 138 MediaStreamInfoBarDelegate::AsMediaStreamInfobarDelegate() { | 138 MediaStreamInfoBarDelegate::AsMediaStreamInfobarDelegate() { |
| 139 return this; | 139 return this; |
| 140 } | 140 } |
| OLD | NEW |