Migrate the notification permission to the new common permission classes.

chrome/browser/content_settings/permission_bubble_request_impl.cc

 // 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/content_settings/permission_bubble_request_impl.h"
 
 #include "chrome/browser/content_settings/permission_context_base.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
@@ skipping 15 matching lines @@
       is_finished_(false) {
 }
 
 PermissionBubbleRequestImpl::~PermissionBubbleRequestImpl() {
   DCHECK(is_finished_);
 }
 
 int PermissionBubbleRequestImpl::GetIconID() const {
   int icon_id;
   switch (type_) {
+    case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
+      icon_id = IDR_INFOBAR_DESKTOP_NOTIFICATIONS;
+      break;

[Peter Beverloo, 2014/07/10 11:29:38]

nit: in permission_context_base.cc you add *_NOTIFICATIONS at the end of the
switch, in this file you add the defines at the beginning of the switch.
Consistency (probably in order of the enum's value declarations) would be nice.

[Miguel Garcia, 2014/07/17 17:24:48]

Done.

     case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
       icon_id = IDR_ALLOWED_MIDI_SYSEX;
       break;
     case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
       icon_id = IDR_INFOBAR_WARNING;
       break;
     default:
       NOTREACHED();
       return IDR_INFOBAR_WARNING;
   }
   return icon_id;
 }
 
 base::string16 PermissionBubbleRequestImpl::GetMessageText() const {
   int message_id;
   switch (type_) {
+      case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
+        message_id = IDS_NOTIFICATION_PERMISSIONS;

[Peter Beverloo, 2014/07/10 11:29:39]

IDS_NOTIFICATION_PERMISSIONS has <ph name="site">,
IDS_MIDI_SYSEX_INFOBAR_QUESTION has <ph name="url"> and
IDS_PUSH_MESSAGES_PERMISSION_QUESTION has <ph name="URL">.

Do these mean anything? Did you confirm that the origin of the permission
request got put in the bubble?

[Miguel Garcia, 2014/07/17 17:24:48]

Yes

On 2014/07/10 11:29:39, Peter Beverloo wrote:

+        break;
       case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
         message_id = IDS_MIDI_SYSEX_INFOBAR_QUESTION;
         break;
       case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
         message_id = IDS_PUSH_MESSAGES_PERMISSION_QUESTION;
         break;
       default:
         NOTREACHED();
         return base::string16();
     }
   return l10n_util::GetStringFUTF16(
       message_id,
       net::FormatUrl(request_origin_, display_languages_,
                      net::kFormatUrlOmitUsernamePassword |
                      net::kFormatUrlOmitTrailingSlashOnBareHostname,
                      net::UnescapeRule::SPACES, NULL, NULL, NULL));
 }
 
 base::string16 PermissionBubbleRequestImpl::GetMessageTextFragment() const {
   int message_id;
   switch (type_) {
+    case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
+      message_id = IDS_NOTIFICATION_PERMISSIONS_FRAGMENT;
+      break;
     case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
       message_id = IDS_MIDI_SYSEX_PERMISSION_FRAGMENT;
       break;
     case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
       message_id = IDS_PUSH_MESSAGES_BUBBLE_FRAGMENT;
       break;
     default:
       NOTREACHED();
       return base::string16();
   }
@@ skipping 17 matching lines @@
 }
 
 void PermissionBubbleRequestImpl::Cancelled() {
   permission_decided_callback_.Run(false, false);
 }
 
 void PermissionBubbleRequestImpl::RequestFinished() {
   is_finished_ = true;
   delete_callback_.Run();
 }