| 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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 |