Revert "Use the same codepath for NOTIFICATIONS and PUSH_MESSAGING permissions"

chrome/browser/permissions/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/permissions/permission_bubble_request_impl.h"
 
 #include "build/build_config.h"
 #include "chrome/browser/permissions/permission_context_base.h"
 #include "chrome/browser/permissions/permission_uma_util.h"
 #include "chrome/grit/generated_resources.h"
@@ skipping 23 matching lines @@
                                          nullptr);
 }
 
 gfx::VectorIconId PermissionBubbleRequestImpl::GetVectorIconId() const {
 #if !defined(OS_MACOSX)
   switch (permission_type_) {
     case content::PermissionType::GEOLOCATION:
       return gfx::VectorIconId::LOCATION_ON;
 #if defined(ENABLE_NOTIFICATIONS)
     case content::PermissionType::NOTIFICATIONS:
-    case content::PermissionType::PUSH_MESSAGING:
       return gfx::VectorIconId::NOTIFICATIONS;
 #endif
 #if defined(OS_CHROMEOS)
     // TODO(xhwang): fix this icon, see crrev.com/863263007
     case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER:
       return gfx::VectorIconId::CHROME_PRODUCT;
 #endif
     case content::PermissionType::MIDI_SYSEX:
       return gfx::VectorIconId::MIDI;
     default:
       NOTREACHED();
       return gfx::VectorIconId::VECTOR_ICON_NONE;
   }
 #else  // !defined(OS_MACOSX)
   return gfx::VectorIconId::VECTOR_ICON_NONE;
 #endif
 }
 
 int PermissionBubbleRequestImpl::GetIconId() const {
   int icon_id = IDR_INFOBAR_WARNING;
 #if defined(OS_MACOSX)
   switch (permission_type_) {
     case content::PermissionType::GEOLOCATION:
       icon_id = IDR_INFOBAR_GEOLOCATION;
       break;
 #if defined(ENABLE_NOTIFICATIONS)
     case content::PermissionType::NOTIFICATIONS:
-    case content::PermissionType::PUSH_MESSAGING:
       icon_id = IDR_INFOBAR_DESKTOP_NOTIFICATIONS;
       break;
 #endif
     case content::PermissionType::MIDI_SYSEX:
       icon_id = IDR_ALLOWED_MIDI_SYSEX;
       break;
     default:
       NOTREACHED();
   }
 #endif
   return icon_id;
 }
 
 base::string16 PermissionBubbleRequestImpl::GetMessageTextFragment() const {
   int message_id;
   switch (permission_type_) {
     case content::PermissionType::GEOLOCATION:
       message_id = IDS_GEOLOCATION_INFOBAR_PERMISSION_FRAGMENT;
       break;
 #if defined(ENABLE_NOTIFICATIONS)
     case content::PermissionType::NOTIFICATIONS:
-    case content::PermissionType::PUSH_MESSAGING:
       message_id = IDS_NOTIFICATION_PERMISSIONS_FRAGMENT;
       break;
 #endif
     case content::PermissionType::MIDI_SYSEX:
       message_id = IDS_MIDI_SYSEX_PERMISSION_FRAGMENT;
       break;
+    case content::PermissionType::PUSH_MESSAGING:
+      message_id = IDS_PUSH_MESSAGES_BUBBLE_FRAGMENT;
+      break;
 #if defined(OS_CHROMEOS)
     case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER:
       message_id = IDS_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_FRAGMENT;
       break;
 #endif
     default:
       NOTREACHED();
       return base::string16();
   }
   return l10n_util::GetStringUTF16(message_id);
@@ skipping 38 matching lines @@
       return PermissionBubbleType::PERMISSION_PUSH_MESSAGING;
 #if defined(OS_CHROMEOS)
     case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER:
       return PermissionBubbleType::PERMISSION_PROTECTED_MEDIA_IDENTIFIER;
 #endif
     default:
       NOTREACHED();
       return PermissionBubbleType::UNKNOWN;
   }
 }