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

Side by Side Diff: chrome/browser/content_settings/permission_bubble_request_impl.cc

Issue 863263007: media: Enable ProtectedMediaIdentifierPermissionContext on ChromeOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 5 years, 10 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/content_settings/permission_bubble_request_impl.h" 5 #include "chrome/browser/content_settings/permission_bubble_request_impl.h"
6 6
7 #include "chrome/browser/content_settings/permission_context_base.h" 7 #include "chrome/browser/content_settings/permission_context_base.h"
8 #include "chrome/browser/content_settings/permission_context_uma_util.h" 8 #include "chrome/browser/content_settings/permission_context_uma_util.h"
9 #include "chrome/grit/generated_resources.h" 9 #include "chrome/grit/generated_resources.h"
10 #include "grit/theme_resources.h" 10 #include "grit/theme_resources.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: 44 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
45 icon_id = IDR_INFOBAR_DESKTOP_NOTIFICATIONS; 45 icon_id = IDR_INFOBAR_DESKTOP_NOTIFICATIONS;
46 break; 46 break;
47 #endif 47 #endif
48 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX: 48 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
49 icon_id = IDR_ALLOWED_MIDI_SYSEX; 49 icon_id = IDR_ALLOWED_MIDI_SYSEX;
50 break; 50 break;
51 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: 51 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
52 icon_id = IDR_INFOBAR_WARNING; 52 icon_id = IDR_INFOBAR_WARNING;
53 break; 53 break;
54 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
55 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
56 icon_id = IDR_INFOBAR_PROTECTED_MEDIA_IDENTIFIER;
57 break;
58 #endif
54 default: 59 default:
55 NOTREACHED(); 60 NOTREACHED();
56 return IDR_INFOBAR_WARNING; 61 return IDR_INFOBAR_WARNING;
57 } 62 }
58 return icon_id; 63 return icon_id;
59 } 64 }
60 65
61 base::string16 PermissionBubbleRequestImpl::GetMessageText() const { 66 base::string16 PermissionBubbleRequestImpl::GetMessageText() const {
62 int message_id; 67 int message_id;
63 switch (type_) { 68 switch (type_) {
64 case CONTENT_SETTINGS_TYPE_GEOLOCATION: 69 case CONTENT_SETTINGS_TYPE_GEOLOCATION:
65 message_id = IDS_GEOLOCATION_INFOBAR_QUESTION; 70 message_id = IDS_GEOLOCATION_INFOBAR_QUESTION;
66 break; 71 break;
67 #if defined(ENABLE_NOTIFICATIONS) 72 #if defined(ENABLE_NOTIFICATIONS)
68 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: 73 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
69 message_id = IDS_NOTIFICATION_PERMISSIONS; 74 message_id = IDS_NOTIFICATION_PERMISSIONS;
70 break; 75 break;
71 #endif 76 #endif
72 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX: 77 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
73 message_id = IDS_MIDI_SYSEX_INFOBAR_QUESTION; 78 message_id = IDS_MIDI_SYSEX_INFOBAR_QUESTION;
74 break; 79 break;
75 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: 80 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
76 message_id = IDS_PUSH_MESSAGES_PERMISSION_QUESTION; 81 message_id = IDS_PUSH_MESSAGES_PERMISSION_QUESTION;
77 break; 82 break;
83 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
84 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
85 message_id = IDS_PROTECTED_MEDIA_IDENTIFIER_INFOBAR_QUESTION;
86 break;
87 #endif
78 default: 88 default:
79 NOTREACHED(); 89 NOTREACHED();
80 return base::string16(); 90 return base::string16();
81 } 91 }
82 return l10n_util::GetStringFUTF16( 92 return l10n_util::GetStringFUTF16(
83 message_id, 93 message_id,
84 net::FormatUrl(request_origin_, display_languages_, 94 net::FormatUrl(request_origin_, display_languages_,
85 net::kFormatUrlOmitUsernamePassword | 95 net::kFormatUrlOmitUsernamePassword |
86 net::kFormatUrlOmitTrailingSlashOnBareHostname, 96 net::kFormatUrlOmitTrailingSlashOnBareHostname,
87 net::UnescapeRule::SPACES, NULL, NULL, NULL)); 97 net::UnescapeRule::SPACES, NULL, NULL, NULL));
88 } 98 }
89 99
90 base::string16 PermissionBubbleRequestImpl::GetMessageTextFragment() const { 100 base::string16 PermissionBubbleRequestImpl::GetMessageTextFragment() const {
91 int message_id; 101 int message_id;
92 switch (type_) { 102 switch (type_) {
93 case CONTENT_SETTINGS_TYPE_GEOLOCATION: 103 case CONTENT_SETTINGS_TYPE_GEOLOCATION:
94 message_id = IDS_GEOLOCATION_INFOBAR_PERMISSION_FRAGMENT; 104 message_id = IDS_GEOLOCATION_INFOBAR_PERMISSION_FRAGMENT;
95 break; 105 break;
96 #if defined(ENABLE_NOTIFICATIONS) 106 #if defined(ENABLE_NOTIFICATIONS)
97 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: 107 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
98 message_id = IDS_NOTIFICATION_PERMISSIONS_FRAGMENT; 108 message_id = IDS_NOTIFICATION_PERMISSIONS_FRAGMENT;
99 break; 109 break;
100 #endif 110 #endif
101 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX: 111 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
102 message_id = IDS_MIDI_SYSEX_PERMISSION_FRAGMENT; 112 message_id = IDS_MIDI_SYSEX_PERMISSION_FRAGMENT;
103 break; 113 break;
104 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: 114 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
105 message_id = IDS_PUSH_MESSAGES_BUBBLE_FRAGMENT; 115 message_id = IDS_PUSH_MESSAGES_BUBBLE_FRAGMENT;
106 break; 116 break;
117 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
118 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
119 message_id = IDS_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_FRAGMENT;
120 break;
121 #endif
107 default: 122 default:
108 NOTREACHED(); 123 NOTREACHED();
109 return base::string16(); 124 return base::string16();
110 } 125 }
111 return l10n_util::GetStringUTF16(message_id); 126 return l10n_util::GetStringUTF16(message_id);
112 } 127 }
113 128
114 bool PermissionBubbleRequestImpl::HasUserGesture() const { 129 bool PermissionBubbleRequestImpl::HasUserGesture() const {
115 return user_gesture_; 130 return user_gesture_;
116 } 131 }
(...skipping 14 matching lines...) Expand all
131 146
132 void PermissionBubbleRequestImpl::Cancelled() { 147 void PermissionBubbleRequestImpl::Cancelled() {
133 RegisterActionTaken(); 148 RegisterActionTaken();
134 permission_decided_callback_.Run(false, false); 149 permission_decided_callback_.Run(false, false);
135 } 150 }
136 151
137 void PermissionBubbleRequestImpl::RequestFinished() { 152 void PermissionBubbleRequestImpl::RequestFinished() {
138 is_finished_ = true; 153 is_finished_ = true;
139 delete_callback_.Run(); 154 delete_callback_.Run();
140 } 155 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/content_settings/permission_queue_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698