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

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

Issue 2385063005: Make PermissionRequest::GetIconId return different types (Closed)
Patch Set: android Created 4 years, 2 months 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/screen_capture_infobar_delegate_android.h" 5 #include "chrome/browser/media/webrtc/screen_capture_infobar_delegate_android.h"
6 6
7 #include "base/callback_helpers.h" 7 #include "base/callback_helpers.h"
8 #include "chrome/browser/android/android_theme_resources.h"
8 #include "chrome/browser/infobars/infobar_service.h" 9 #include "chrome/browser/infobars/infobar_service.h"
9 #include "chrome/browser/media/webrtc/desktop_streams_registry.h" 10 #include "chrome/browser/media/webrtc/desktop_streams_registry.h"
10 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h" 11 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
11 #include "chrome/browser/media/webrtc/media_stream_capture_indicator.h" 12 #include "chrome/browser/media/webrtc/media_stream_capture_indicator.h"
12 #include "chrome/grit/generated_resources.h" 13 #include "chrome/grit/generated_resources.h"
13 #include "chrome/grit/theme_resources.h"
14 #include "components/infobars/core/infobar.h" 14 #include "components/infobars/core/infobar.h"
15 #include "components/url_formatter/elide_url.h" 15 #include "components/url_formatter/elide_url.h"
16 #include "content/public/browser/web_contents.h" 16 #include "content/public/browser/web_contents.h"
17 #include "content/public/common/media_stream_request.h" 17 #include "content/public/common/media_stream_request.h"
18 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_types.h" 18 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_types.h"
19 #include "ui/base/l10n/l10n_util.h" 19 #include "ui/base/l10n/l10n_util.h"
20 20
21 // static 21 // static
22 void ScreenCaptureInfoBarDelegateAndroid::Create( 22 void ScreenCaptureInfoBarDelegateAndroid::Create(
23 content::WebContents* web_contents, 23 content::WebContents* web_contents,
(...skipping 28 matching lines...) Expand all
52 return SCREEN_CAPTURE_INFOBAR_DELEGATE_ANDROID; 52 return SCREEN_CAPTURE_INFOBAR_DELEGATE_ANDROID;
53 } 53 }
54 54
55 base::string16 ScreenCaptureInfoBarDelegateAndroid::GetMessageText() const { 55 base::string16 ScreenCaptureInfoBarDelegateAndroid::GetMessageText() const {
56 return l10n_util::GetStringFUTF16( 56 return l10n_util::GetStringFUTF16(
57 IDS_MEDIA_CAPTURE_SCREEN, 57 IDS_MEDIA_CAPTURE_SCREEN,
58 url_formatter::FormatUrlForSecurityDisplay(request_.security_origin)); 58 url_formatter::FormatUrlForSecurityDisplay(request_.security_origin));
59 } 59 }
60 60
61 int ScreenCaptureInfoBarDelegateAndroid::GetIconId() const { 61 int ScreenCaptureInfoBarDelegateAndroid::GetIconId() const {
62 return IDR_INFOBAR_MEDIA_STREAM_SCREEN; 62 return IDR_ANDROID_INFOBAR_MEDIA_STREAM_SCREEN;
63 } 63 }
64 64
65 base::string16 ScreenCaptureInfoBarDelegateAndroid::GetButtonLabel( 65 base::string16 ScreenCaptureInfoBarDelegateAndroid::GetButtonLabel(
66 InfoBarButton button) const { 66 InfoBarButton button) const {
67 return l10n_util::GetStringUTF16((button == BUTTON_OK) ? IDS_PERMISSION_ALLOW 67 return l10n_util::GetStringUTF16((button == BUTTON_OK) ? IDS_PERMISSION_ALLOW
68 : IDS_PERMISSION_DENY); 68 : IDS_PERMISSION_DENY);
69 } 69 }
70 70
71 bool ScreenCaptureInfoBarDelegateAndroid::Accept() { 71 bool ScreenCaptureInfoBarDelegateAndroid::Accept() {
72 RunCallback(content::MEDIA_DEVICE_OK); 72 RunCallback(content::MEDIA_DEVICE_OK);
(...skipping 21 matching lines...) Expand all
94 devices.push_back(content::MediaStreamDevice( 94 devices.push_back(content::MediaStreamDevice(
95 content::MEDIA_DESKTOP_VIDEO_CAPTURE, screen_id.ToString(), "Screen")); 95 content::MEDIA_DESKTOP_VIDEO_CAPTURE, screen_id.ToString(), "Screen"));
96 96
97 ui = MediaCaptureDevicesDispatcher::GetInstance() 97 ui = MediaCaptureDevicesDispatcher::GetInstance()
98 ->GetMediaStreamCaptureIndicator() 98 ->GetMediaStreamCaptureIndicator()
99 ->RegisterMediaStream(web_contents_, devices); 99 ->RegisterMediaStream(web_contents_, devices);
100 } 100 }
101 101
102 base::ResetAndReturn(&callback_).Run(devices, result, std::move(ui)); 102 base::ResetAndReturn(&callback_).Run(devices, result, std::move(ui));
103 } 103 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698