Chromium Code Reviews| Index: chrome/browser/durable_storage_permission_infobar_delegate.cc |
| diff --git a/chrome/browser/media/midi_permission_infobar_delegate.cc b/chrome/browser/durable_storage_permission_infobar_delegate.cc |
| similarity index 53% |
| copy from chrome/browser/media/midi_permission_infobar_delegate.cc |
| copy to chrome/browser/durable_storage_permission_infobar_delegate.cc |
| index 5a590cdccb85bf14f7011fafc3faa2fd6fa9736c..d0ad2127d212799ea184679a8544cb4688816be6 100644 |
| --- a/chrome/browser/media/midi_permission_infobar_delegate.cc |
| +++ b/chrome/browser/durable_storage_permission_infobar_delegate.cc |
| @@ -2,8 +2,9 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#include "chrome/browser/media/midi_permission_infobar_delegate.h" |
| +#include "chrome/browser/durable_storage_permission_infobar_delegate.h" |
| +#include "base/strings/utf_string_conversions.h" |
| #include "chrome/browser/infobars/infobar_service.h" |
| #include "chrome/grit/generated_resources.h" |
| #include "components/infobars/core/infobar.h" |
| @@ -12,41 +13,36 @@ |
| #include "ui/base/l10n/l10n_util.h" |
| // static |
| -infobars::InfoBar* MidiPermissionInfoBarDelegate::Create( |
| +infobars::InfoBar* DurableStoragePermissionInfoBarDelegate::Create( |
| InfoBarService* infobar_service, |
| PermissionQueueController* controller, |
| const PermissionRequestID& id, |
| const GURL& requesting_frame, |
| const std::string& display_languages, |
| ContentSettingsType type) { |
| - return infobar_service->AddInfoBar(infobar_service->CreateConfirmInfoBar( |
| - scoped_ptr<ConfirmInfoBarDelegate>(new MidiPermissionInfoBarDelegate( |
| - controller, id, requesting_frame, display_languages, type)))); |
| + return infobar_service->AddInfoBar( |
| + infobar_service->CreateConfirmInfoBar(scoped_ptr<ConfirmInfoBarDelegate>( |
| + new DurableStoragePermissionInfoBarDelegate( |
| + controller, id, requesting_frame, display_languages, type)))); |
| } |
| -MidiPermissionInfoBarDelegate::MidiPermissionInfoBarDelegate( |
| - PermissionQueueController* controller, |
| - const PermissionRequestID& id, |
| - const GURL& requesting_frame, |
| - const std::string& display_languages, |
| - ContentSettingsType type) |
| +DurableStoragePermissionInfoBarDelegate:: |
| + DurableStoragePermissionInfoBarDelegate( |
| + PermissionQueueController* controller, |
| + const PermissionRequestID& id, |
| + const GURL& requesting_frame, |
| + const std::string& display_languages, |
| + ContentSettingsType type) |
| : PermissionInfobarDelegate(controller, id, requesting_frame, type), |
| requesting_frame_(requesting_frame), |
| display_languages_(display_languages) { |
| } |
| -MidiPermissionInfoBarDelegate::~MidiPermissionInfoBarDelegate() { |
| -} |
| - |
| -int MidiPermissionInfoBarDelegate::GetIconID() const { |
|
mlamouri (slow - plz ping)
2015/08/10 14:41:15
You will need an icon for the InfoBarDelegate. You
dgrogan
2015/08/10 22:39:19
Acknowledged.
|
| - return IDR_INFOBAR_MIDI; |
| -} |
| - |
| -base::string16 MidiPermissionInfoBarDelegate::GetMessageText() const { |
| +base::string16 DurableStoragePermissionInfoBarDelegate::GetMessageText() const { |
| return l10n_util::GetStringFUTF16( |
| - IDS_MIDI_SYSEX_INFOBAR_QUESTION, |
| + IDS_DURABLE_STORAGE_INFOBAR_QUESTION, |
| net::FormatUrl(requesting_frame_.GetOrigin(), display_languages_, |
| net::kFormatUrlOmitUsernamePassword | |
| - net::kFormatUrlOmitTrailingSlashOnBareHostname, |
| + net::kFormatUrlOmitTrailingSlashOnBareHostname, |
| net::UnescapeRule::SPACES, NULL, NULL, NULL)); |
| } |