Migrate the notification permission to the new common permission classes.

chrome/browser/content_settings/permission_bubble_request_impl.cc

Index: chrome/browser/content_settings/permission_bubble_request_impl.cc
diff --git a/chrome/browser/content_settings/permission_bubble_request_impl.cc b/chrome/browser/content_settings/permission_bubble_request_impl.cc
index b7341db6185730c6356737728f64caf66c4189cd..58182d91466060f1bebace7f6a71d112f0274df7 100644
--- a/chrome/browser/content_settings/permission_bubble_request_impl.cc
+++ b/chrome/browser/content_settings/permission_bubble_request_impl.cc
@@ -37,6 +37,11 @@ PermissionBubbleRequestImpl::~PermissionBubbleRequestImpl() {
 int PermissionBubbleRequestImpl::GetIconID() const {
   int icon_id;
   switch (type_) {
+#if defined(ENABLE_NOTIFICATIONS)
+    case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
+      icon_id = IDR_INFOBAR_DESKTOP_NOTIFICATIONS;
+      break;
+#endif  // ENABLE_NOTIFICATIONS

[Peter Beverloo, 2014/07/18 10:42:38]

nit: don't need the comment after the #endif if the block is <~5 lines.

[Miguel Garcia, 2014/07/18 12:27:08]

Done.

     case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
       icon_id = IDR_ALLOWED_MIDI_SYSEX;
       break;
@@ -53,6 +58,11 @@ int PermissionBubbleRequestImpl::GetIconID() const {
 base::string16 PermissionBubbleRequestImpl::GetMessageText() const {
   int message_id;
   switch (type_) {
+#if defined(ENABLE_NOTIFICATIONS)
+      case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
+        message_id = IDS_NOTIFICATION_PERMISSIONS;
+        break;
+#endif // ENABLE_NOTIFICATIONS
       case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
         message_id = IDS_MIDI_SYSEX_INFOBAR_QUESTION;
         break;
@@ -74,6 +84,11 @@ base::string16 PermissionBubbleRequestImpl::GetMessageText() const {
 base::string16 PermissionBubbleRequestImpl::GetMessageTextFragment() const {
   int message_id;
   switch (type_) {
+#if defined(ENABLE_NOTIFICATIONS)
+    case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
+      message_id = IDS_NOTIFICATION_PERMISSIONS_FRAGMENT;
+      break;
+#endif  // ENABLE_NOTIFICATIONS
     case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
       message_id = IDS_MIDI_SYSEX_PERMISSION_FRAGMENT;
       break;