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

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: ToT 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 "components/url_formatter/url_formatter.h" 10 #include "components/url_formatter/url_formatter.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 icon_id = IDR_ALLOWED_MIDI_SYSEX; 68 icon_id = IDR_ALLOWED_MIDI_SYSEX;
69 break; 69 break;
70 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: 70 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
71 icon_id = IDR_INFOBAR_WARNING; 71 icon_id = IDR_INFOBAR_WARNING;
72 break; 72 break;
73 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) 73 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
74 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER: 74 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
75 icon_id = IDR_INFOBAR_PROTECTED_MEDIA_IDENTIFIER; 75 icon_id = IDR_INFOBAR_PROTECTED_MEDIA_IDENTIFIER;
76 break; 76 break;
77 #endif 77 #endif
78 // TODO(dgrogan): Get a real icon. https://crbug.com/516069
79 case CONTENT_SETTINGS_TYPE_DURABLE_STORAGE:
80 icon_id = IDR_INFOBAR_WARNING;
81 break;
78 default: 82 default:
79 NOTREACHED(); 83 NOTREACHED();
80 return IDR_INFOBAR_WARNING; 84 return IDR_INFOBAR_WARNING;
81 } 85 }
82 return icon_id; 86 return icon_id;
83 } 87 }
84 88
85 base::string16 PermissionBubbleRequestImpl::GetMessageText() const { 89 base::string16 PermissionBubbleRequestImpl::GetMessageText() const {
86 int message_id; 90 int message_id;
87 switch (type_) { 91 switch (type_) {
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 message_id = IDS_MIDI_SYSEX_PERMISSION_FRAGMENT; 136 message_id = IDS_MIDI_SYSEX_PERMISSION_FRAGMENT;
133 break; 137 break;
134 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: 138 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
135 message_id = IDS_PUSH_MESSAGES_BUBBLE_FRAGMENT; 139 message_id = IDS_PUSH_MESSAGES_BUBBLE_FRAGMENT;
136 break; 140 break;
137 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) 141 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
138 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER: 142 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
139 message_id = IDS_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_FRAGMENT; 143 message_id = IDS_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_FRAGMENT;
140 break; 144 break;
141 #endif 145 #endif
146 case CONTENT_SETTINGS_TYPE_DURABLE_STORAGE:
147 message_id = IDS_DURABLE_STORAGE_BUBBLE_FRAGMENT;
148 break;
142 default: 149 default:
143 NOTREACHED(); 150 NOTREACHED();
144 return base::string16(); 151 return base::string16();
145 } 152 }
146 return l10n_util::GetStringUTF16(message_id); 153 return l10n_util::GetStringUTF16(message_id);
147 } 154 }
148 155
149 bool PermissionBubbleRequestImpl::HasUserGesture() const { 156 bool PermissionBubbleRequestImpl::HasUserGesture() const {
150 return user_gesture_; 157 return user_gesture_;
151 } 158 }
(...skipping 14 matching lines...) Expand all
166 173
167 void PermissionBubbleRequestImpl::Cancelled() { 174 void PermissionBubbleRequestImpl::Cancelled() {
168 RegisterActionTaken(); 175 RegisterActionTaken();
169 permission_decided_callback_.Run(false, CONTENT_SETTING_DEFAULT); 176 permission_decided_callback_.Run(false, CONTENT_SETTING_DEFAULT);
170 } 177 }
171 178
172 void PermissionBubbleRequestImpl::RequestFinished() { 179 void PermissionBubbleRequestImpl::RequestFinished() {
173 is_finished_ = true; 180 is_finished_ = true;
174 delete_callback_.Run(); 181 delete_callback_.Run();
175 } 182 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698