Remove some more desktop infobar PNGs.

chrome/browser/permissions/permission_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_request_impl.h"
 
 #include "build/build_config.h"
+#include "chrome/browser/android/android_theme_resources.h"
 #include "chrome/browser/permissions/permission_decision_auto_blocker.h"
 #include "chrome/browser/permissions/permission_uma_util.h"
 #include "chrome/browser/permissions/permission_util.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/url_formatter/elide_url.h"
 #include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/vector_icons_public.h"
 
@@ skipping 15 matching lines @@
 
 PermissionRequestImpl::~PermissionRequestImpl() {
   DCHECK(is_finished_);
   if (!action_taken_) {
     PermissionUmaUtil::PermissionIgnored(permission_type_, GetGestureType(),
                                          request_origin_, profile_);
   }
 }
 
 gfx::VectorIconId PermissionRequestImpl::GetVectorIconId() const {
-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if !defined(OS_ANDROID)

[Peter Kasting, 2016/10/05 01:13:13]

Nit: Reverse to avoid double-negative in "else":

#if defined(OS_ANDROID)
  return gfx::VectorIconId::VECTOR_ICON_NONE;
#else
  ...
#endif

[Evan Stade, 2016/10/05 17:42:29]

Done.

   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;
     case content::PermissionType::FLASH:
       return gfx::VectorIconId::EXTENSION;
     default:
       NOTREACHED();
       return gfx::VectorIconId::VECTOR_ICON_NONE;
   }
-#else  // !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#else  // !defined(OS_ANDROID)
   return gfx::VectorIconId::VECTOR_ICON_NONE;
 #endif
 }
 
 int PermissionRequestImpl::GetIconId() const {
-  int icon_id = IDR_INFOBAR_WARNING;
-#if defined(OS_MACOSX) || defined(OS_ANDROID)
+  int icon_id = 0;
+#if defined(OS_ANDROID)

[Peter Kasting, 2016/10/05 01:13:13]

Nit: Maybe put the entire function (and declaration in the .h) in an #if
OS_ANDROID, then eliminate |icon_id| entirely and just "return IDR_XXX" from
each switch case.

[Evan Stade, 2016/10/05 17:42:29]

done

I'm not entirely sure this is even necessary on android but I have another patch
coming to remove it if not.

   switch (permission_type_) {
     case content::PermissionType::GEOLOCATION:
-      icon_id = IDR_INFOBAR_GEOLOCATION;
+      icon_id = IDR_ANDROID_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;
     case content::PermissionType::FLASH:
       icon_id = IDR_ALLOWED_PLUGINS;
       break;
     default:
       NOTREACHED();
   }
 #endif
@@ skipping 82 matching lines @@
       NOTREACHED();
       return PermissionRequestType::UNKNOWN;
   }
 }
 
 PermissionRequestGestureType PermissionRequestImpl::GetGestureType()
     const {
   return has_gesture_ ? PermissionRequestGestureType::GESTURE
                       : PermissionRequestGestureType::NO_GESTURE;
 }