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

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

Issue 1164073005: Allow script to request durable storage permission (chrome side) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: follow Mounir's suggestions for code cleanup Created 5 years, 4 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/permissions/permission_bubble_request_impl.h" 5 #include "chrome/browser/permissions/permission_bubble_request_impl.h"
6 6
7 #include "chrome/browser/permissions/permission_context_base.h" 7 #include "chrome/browser/permissions/permission_context_base.h"
8 #include "chrome/browser/permissions/permission_context_uma_util.h" 8 #include "chrome/browser/permissions/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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 icon_id = IDR_ALLOWED_MIDI_SYSEX; 67 icon_id = IDR_ALLOWED_MIDI_SYSEX;
68 break; 68 break;
69 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: 69 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
70 icon_id = IDR_INFOBAR_WARNING; 70 icon_id = IDR_INFOBAR_WARNING;
71 break; 71 break;
72 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) 72 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
73 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER: 73 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
74 icon_id = IDR_INFOBAR_PROTECTED_MEDIA_IDENTIFIER; 74 icon_id = IDR_INFOBAR_PROTECTED_MEDIA_IDENTIFIER;
75 break; 75 break;
76 #endif 76 #endif
77 // TODO(dgrogan): Get a real icon. https://crbug.com/516069
78 case CONTENT_SETTINGS_TYPE_DURABLE_STORAGE:
79 icon_id = IDR_INFOBAR_WARNING;
80 break;
77 default: 81 default:
78 NOTREACHED(); 82 NOTREACHED();
79 return IDR_INFOBAR_WARNING; 83 return IDR_INFOBAR_WARNING;
80 } 84 }
81 return icon_id; 85 return icon_id;
82 } 86 }
83 87
84 base::string16 PermissionBubbleRequestImpl::GetMessageText() const { 88 base::string16 PermissionBubbleRequestImpl::GetMessageText() const {
85 int message_id; 89 int message_id;
86 switch (type_) { 90 switch (type_) {
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 message_id = IDS_MIDI_SYSEX_PERMISSION_FRAGMENT; 134 message_id = IDS_MIDI_SYSEX_PERMISSION_FRAGMENT;
131 break; 135 break;
132 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: 136 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
133 message_id = IDS_PUSH_MESSAGES_BUBBLE_FRAGMENT; 137 message_id = IDS_PUSH_MESSAGES_BUBBLE_FRAGMENT;
134 break; 138 break;
135 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) 139 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
136 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER: 140 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
137 message_id = IDS_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_FRAGMENT; 141 message_id = IDS_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_FRAGMENT;
138 break; 142 break;
139 #endif 143 #endif
144 case CONTENT_SETTINGS_TYPE_DURABLE_STORAGE:
145 message_id = IDS_DURABLE_STORAGE_BUBBLE_FRAGMENT;
146 break;
140 default: 147 default:
141 NOTREACHED(); 148 NOTREACHED();
142 return base::string16(); 149 return base::string16();
143 } 150 }
144 return l10n_util::GetStringUTF16(message_id); 151 return l10n_util::GetStringUTF16(message_id);
145 } 152 }
146 153
147 bool PermissionBubbleRequestImpl::HasUserGesture() const { 154 bool PermissionBubbleRequestImpl::HasUserGesture() const {
148 return user_gesture_; 155 return user_gesture_;
149 } 156 }
(...skipping 14 matching lines...) Expand all
164 171
165 void PermissionBubbleRequestImpl::Cancelled() { 172 void PermissionBubbleRequestImpl::Cancelled() {
166 RegisterActionTaken(); 173 RegisterActionTaken();
167 permission_decided_callback_.Run(false, CONTENT_SETTING_DEFAULT); 174 permission_decided_callback_.Run(false, CONTENT_SETTING_DEFAULT);
168 } 175 }
169 176
170 void PermissionBubbleRequestImpl::RequestFinished() { 177 void PermissionBubbleRequestImpl::RequestFinished() {
171 is_finished_ = true; 178 is_finished_ = true;
172 delete_callback_.Run(); 179 delete_callback_.Run();
173 } 180 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698