Remove some images that are no longer needed on views

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 "chrome/browser/permissions/permission_context_base.h"
 #include "chrome/browser/permissions/permission_context_uma_util.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/url_formatter/elide_url.h"
@@ skipping 28 matching lines @@
 gfx::VectorIconId PermissionBubbleRequestImpl::GetVectorIconId() const {
 #if defined(TOOLKIT_VIEWS)
   switch (type_) {
     case CONTENT_SETTINGS_TYPE_GEOLOCATION:
       return gfx::VectorIconId::LOCATION_ON;
 #if defined(ENABLE_NOTIFICATIONS)
     case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
       return gfx::VectorIconId::NOTIFICATIONS;
 #endif
 #if defined(OS_CHROMEOS)
+    // TODO(xhwang): fix this icon, see crrev.com/863263007
     case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
+      return gfx::VectorIconId::CHROME_PRODUCT;
 #endif
     case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
-    case CONTENT_SETTINGS_TYPE_DURABLE_STORAGE:
-      // TODO(estade): add vector icons for these.
-      return gfx::VectorIconId::VECTOR_ICON_NONE;
+      return gfx::VectorIconId::MIDI;
     default:
       NOTREACHED();
       return gfx::VectorIconId::VECTOR_ICON_NONE;
   }
 #else  // !defined(TOOLKIT_VIEWS)
   return gfx::VectorIconId::VECTOR_ICON_NONE;
 #endif
 }
 
 int PermissionBubbleRequestImpl::GetIconId() const {
-  int icon_id;
+  int icon_id = IDR_INFOBAR_WARNING;
+#if !defined(TOOLKIT_VIEWS)
   switch (type_) {
     case CONTENT_SETTINGS_TYPE_GEOLOCATION:
       icon_id = IDR_INFOBAR_GEOLOCATION;
       break;
 #if defined(ENABLE_NOTIFICATIONS)
     case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
       icon_id = IDR_INFOBAR_DESKTOP_NOTIFICATIONS;
       break;
 #endif
     case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
       icon_id = IDR_ALLOWED_MIDI_SYSEX;
       break;
-#if defined(OS_CHROMEOS)

[sky, 2015/10/02 23:26:39]

How come it's safe to remove this?

[Evan Stade, 2015/10/05 18:42:52]

For Cros the icon always comes from GetVectorIconId; this entire block is now
!views only.

-    case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
-      icon_id = IDR_INFOBAR_PROTECTED_MEDIA_IDENTIFIER;
-      break;
-#endif
     default:
       NOTREACHED();
-      return IDR_INFOBAR_WARNING;
   }
+#endif
   return icon_id;
 }
 
 base::string16 PermissionBubbleRequestImpl::GetMessageText() const {
   int message_id;
   switch (type_) {
     case CONTENT_SETTINGS_TYPE_GEOLOCATION:
       message_id = IDS_GEOLOCATION_INFOBAR_QUESTION;
       break;
 #if defined(ENABLE_NOTIFICATIONS)
@@ skipping 73 matching lines @@
 
 void PermissionBubbleRequestImpl::Cancelled() {
   RegisterActionTaken();
   permission_decided_callback_.Run(false, CONTENT_SETTING_DEFAULT);
 }
 
 void PermissionBubbleRequestImpl::RequestFinished() {
   is_finished_ = true;
   delete_callback_.Run();
 }