OLD | NEW |
---|---|
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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
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) | 54 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) |
55 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER: | 55 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER: |
56 icon_id = IDR_INFOBAR_PROTECTED_MEDIA_IDENTIFIER; | 56 icon_id = IDR_INFOBAR_PROTECTED_MEDIA_IDENTIFIER; |
57 break; | 57 break; |
58 #endif | 58 #endif |
59 // TODO(dgrogan): Get a real icon from rolfe@. | |
mlamouri (slow - plz ping)
2015/07/02 09:53:01
nit: could you have a bug number?
| |
60 case CONTENT_SETTINGS_TYPE_DURABLE_STORAGE: | |
61 icon_id = IDR_INFOBAR_WARNING; | |
62 break; | |
59 default: | 63 default: |
60 NOTREACHED(); | 64 NOTREACHED(); |
61 return IDR_INFOBAR_WARNING; | 65 return IDR_INFOBAR_WARNING; |
62 } | 66 } |
63 return icon_id; | 67 return icon_id; |
64 } | 68 } |
65 | 69 |
66 base::string16 PermissionBubbleRequestImpl::GetMessageText() const { | 70 base::string16 PermissionBubbleRequestImpl::GetMessageText() const { |
67 int message_id; | 71 int message_id; |
68 switch (type_) { | 72 switch (type_) { |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
112 message_id = IDS_MIDI_SYSEX_PERMISSION_FRAGMENT; | 116 message_id = IDS_MIDI_SYSEX_PERMISSION_FRAGMENT; |
113 break; | 117 break; |
114 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: | 118 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: |
115 message_id = IDS_PUSH_MESSAGES_BUBBLE_FRAGMENT; | 119 message_id = IDS_PUSH_MESSAGES_BUBBLE_FRAGMENT; |
116 break; | 120 break; |
117 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) | 121 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) |
118 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER: | 122 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER: |
119 message_id = IDS_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_FRAGMENT; | 123 message_id = IDS_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_FRAGMENT; |
120 break; | 124 break; |
121 #endif | 125 #endif |
126 case CONTENT_SETTINGS_TYPE_DURABLE_STORAGE: | |
127 message_id = IDS_DURABLE_STORAGE_BUBBLE_FRAGMENT; | |
128 break; | |
122 default: | 129 default: |
123 NOTREACHED(); | 130 NOTREACHED(); |
124 return base::string16(); | 131 return base::string16(); |
125 } | 132 } |
126 return l10n_util::GetStringUTF16(message_id); | 133 return l10n_util::GetStringUTF16(message_id); |
127 } | 134 } |
128 | 135 |
129 bool PermissionBubbleRequestImpl::HasUserGesture() const { | 136 bool PermissionBubbleRequestImpl::HasUserGesture() const { |
130 return user_gesture_; | 137 return user_gesture_; |
131 } | 138 } |
(...skipping 14 matching lines...) Expand all Loading... | |
146 | 153 |
147 void PermissionBubbleRequestImpl::Cancelled() { | 154 void PermissionBubbleRequestImpl::Cancelled() { |
148 RegisterActionTaken(); | 155 RegisterActionTaken(); |
149 permission_decided_callback_.Run(false, CONTENT_SETTING_DEFAULT); | 156 permission_decided_callback_.Run(false, CONTENT_SETTING_DEFAULT); |
150 } | 157 } |
151 | 158 |
152 void PermissionBubbleRequestImpl::RequestFinished() { | 159 void PermissionBubbleRequestImpl::RequestFinished() { |
153 is_finished_ = true; | 160 is_finished_ = true; |
154 delete_callback_.Run(); | 161 delete_callback_.Run(); |
155 } | 162 } |
OLD | NEW |