| Index: chrome/browser/notifications/desktop_notification_infobar_delegate.cc
|
| diff --git a/chrome/browser/media/midi_permission_infobar_delegate.cc b/chrome/browser/notifications/desktop_notification_infobar_delegate.cc
|
| similarity index 65%
|
| copy from chrome/browser/media/midi_permission_infobar_delegate.cc
|
| copy to chrome/browser/notifications/desktop_notification_infobar_delegate.cc
|
| index f8b74a27d73c15580cafdd37bdb14ef1a3d4e2a4..246ae15b1c9b6b68f3ae7eda8a58af9636e049b9 100644
|
| --- a/chrome/browser/media/midi_permission_infobar_delegate.cc
|
| +++ b/chrome/browser/notifications/desktop_notification_infobar_delegate.cc
|
| @@ -1,12 +1,13 @@
|
| -// Copyright 2013 The Chromium Authors. All rights reserved.
|
| +// Copyright 2014 The Chromium Authors. All rights reserved.
|
| // 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/notifications/desktop_notification_infobar_delegate.h"
|
|
|
| #include "chrome/browser/content_settings/permission_queue_controller.h"
|
| #include "chrome/browser/content_settings/permission_request_id.h"
|
| #include "chrome/browser/infobars/infobar_service.h"
|
| +#include "chrome/common/content_settings_types.h"
|
| #include "components/infobars/core/infobar.h"
|
| #include "content/public/browser/navigation_entry.h"
|
| #include "content/public/browser/web_contents.h"
|
| @@ -17,44 +18,43 @@
|
| #include "ui/base/l10n/l10n_util.h"
|
|
|
| // static
|
| -infobars::InfoBar* MidiPermissionInfoBarDelegate::Create(
|
| +infobars::InfoBar* DesktopNotificationInfoBarDelegate::Create(
|
| InfoBarService* infobar_service,
|
| PermissionQueueController* controller,
|
| const PermissionRequestID& id,
|
| const GURL& requesting_frame,
|
| - const std::string& display_languages,
|
| - ContentSettingsType type) {
|
| + const std::string& display_languages) {
|
| const content::NavigationEntry* committed_entry =
|
| infobar_service->web_contents()->GetController().GetLastCommittedEntry();
|
| return infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
|
| - scoped_ptr<ConfirmInfoBarDelegate>(new MidiPermissionInfoBarDelegate(
|
| + scoped_ptr<ConfirmInfoBarDelegate>(new DesktopNotificationInfoBarDelegate(
|
| controller, id, requesting_frame,
|
| committed_entry ? committed_entry->GetUniqueID() : 0,
|
| - display_languages, type))));
|
| + display_languages))));
|
| }
|
|
|
| -MidiPermissionInfoBarDelegate::MidiPermissionInfoBarDelegate(
|
| +DesktopNotificationInfoBarDelegate::DesktopNotificationInfoBarDelegate(
|
| PermissionQueueController* controller,
|
| const PermissionRequestID& id,
|
| const GURL& requesting_frame,
|
| int contents_unique_id,
|
| - const std::string& display_languages,
|
| - ContentSettingsType type)
|
| - : PermissionInfobarDelegate(controller, id, requesting_frame, type),
|
| + const std::string& display_languages)
|
| + : PermissionInfobarDelegate(controller, id, requesting_frame,
|
| + CONTENT_SETTINGS_TYPE_NOTIFICATIONS),
|
| requesting_frame_(requesting_frame),
|
| display_languages_(display_languages) {
|
| }
|
|
|
| -MidiPermissionInfoBarDelegate::~MidiPermissionInfoBarDelegate() {
|
| +DesktopNotificationInfoBarDelegate::~DesktopNotificationInfoBarDelegate() {
|
| }
|
|
|
| -int MidiPermissionInfoBarDelegate::GetIconID() const {
|
| - return IDR_INFOBAR_MIDI;
|
| +int DesktopNotificationInfoBarDelegate::GetIconID() const {
|
| + return IDR_INFOBAR_DESKTOP_NOTIFICATIONS;
|
| }
|
|
|
| -base::string16 MidiPermissionInfoBarDelegate::GetMessageText() const {
|
| +base::string16 DesktopNotificationInfoBarDelegate::GetMessageText() const {
|
| return l10n_util::GetStringFUTF16(
|
| - IDS_MIDI_SYSEX_INFOBAR_QUESTION,
|
| + IDS_NOTIFICATION_PERMISSIONS,
|
| net::FormatUrl(requesting_frame_.GetOrigin(), display_languages_,
|
| net::kFormatUrlOmitUsernamePassword |
|
| net::kFormatUrlOmitTrailingSlashOnBareHostname,
|
|
|