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

Unified Diff: chrome/browser/notifications/desktop_notification_infobar_delegate.cc

Issue 376253005: Migrate the notification permission to the new common permission classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 side-by-side diff with in-line comments
Download patch
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 67%
copy from chrome/browser/media/midi_permission_infobar_delegate.cc
copy to chrome/browser/notifications/desktop_notification_infobar_delegate.cc
index 394b284ae2f712684033a52199423ceb4ce6227b..1a9b818fb0688d8ca9429b20469f22dec532b666 100644
--- a/chrome/browser/media/midi_permission_infobar_delegate.cc
+++ b/chrome/browser/notifications/desktop_notification_infobar_delegate.cc
@@ -1,9 +1,8 @@
-// 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>
Peter Beverloo 2014/07/10 11:29:39 Includes of source files should use quotes, not br
Miguel Garcia 2014/07/17 17:24:48 Yeah sorry, eclipse decides <> are better not sure
#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"
@@ -17,7 +16,7 @@
#include "ui/base/l10n/l10n_util.h"
// static
-infobars::InfoBar* MidiPermissionInfoBarDelegate::Create(
+infobars::InfoBar* DesktopNotificationInfoBarDelegate::Create(
InfoBarService* infobar_service,
PermissionQueueController* controller,
const PermissionRequestID& id,
@@ -26,33 +25,34 @@ infobars::InfoBar* MidiPermissionInfoBarDelegate::Create(
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))));
}
-MidiPermissionInfoBarDelegate::MidiPermissionInfoBarDelegate(
+DesktopNotificationInfoBarDelegate::DesktopNotificationInfoBarDelegate(
PermissionQueueController* controller,
const PermissionRequestID& id,
const GURL& requesting_frame,
int contents_unique_id,
const std::string& display_languages)
- : PermissionInfobarDelegate(controller, id, requesting_frame),
- requesting_frame_(requesting_frame),
- display_languages_(display_languages) {
+ : PermissionInfobarDelegate(controller, id, requesting_frame),
Peter Beverloo 2014/07/10 11:29:39 nit: four space indent.
Miguel Garcia 2014/07/17 17:24:48 Done.
+ 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,

Powered by Google App Engine
This is Rietveld 408576698