Make PermissionRequest::GetIconId return different types

chrome/browser/permissions/permission_request.h

 // 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.
 
 #ifndef CHROME_BROWSER_PERMISSIONS_PERMISSION_REQUEST_H_
 #define CHROME_BROWSER_PERMISSIONS_PERMISSION_REQUEST_H_
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "content/public/browser/permission_type.h"
@@ skipping 42 matching lines @@
 // Describes the interface a feature making permission requests should
 // implement. A class of this type is registered with the permission request
 // manager to receive updates about the result of the permissions request
 // from the bubble or infobar. It should live until it is unregistered or until
 // RequestFinished is called.
 // Note that no particular guarantees are made about what exact UI surface
 // is presented to the user. The delegate may be coalesced with other bubble
 // requests, or depending on the situation, not shown at all.
 class PermissionRequest {
  public:
+#if defined(OS_ANDROID)
+  // On Android, icons are represented with an IDR_ identifier.

[Peter Kasting, 2016/10/06 07:10:30]

Are we planning to convert Android to vector icons someday?  If so, is there a
bug on this, that we could link as a TODO here?

[Evan Stade, 2016/10/06 15:33:50]

I'm not aware of any such plans.

+  typedef int IconId;
+#else
+  // On desktop, we use a vector icon id.
+  typedef gfx::VectorIconId IconId;
+#endif
+
   PermissionRequest();
   virtual ~PermissionRequest() {}
 
-  // Returns a vector icon id if the icon should be drawn as a vector
-  // resource. Otherwise, returns VECTOR_ICON_NONE.
-  virtual gfx::VectorIconId GetVectorIconId() const;
-
   // The icon to use next to the message text fragment in the permission bubble.
-  // TODO(estade): remove this in favor of GetVectorIconId().
-  virtual int GetIconId() const;
+  virtual IconId GetIconId() const = 0;
 
   // Returns the shortened prompt text for this permission.  Must be phrased
   // as a heading, e.g. "Location", or "Camera". The permission bubble may
   // coalesce different requests, and if it does, this text will be displayed
   // next to an image and indicate the user grants the permission.
   virtual base::string16 GetMessageTextFragment() const = 0;
 
   // Get the origin on whose behalf this permission request is being made.
   virtual GURL GetOrigin() const = 0;
 
@@ skipping 31 matching lines @@
   bool persist() const { return persist_; }
 
  private:
   // Whether or not the response for this prompt should be persisted.
   bool persist_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionRequest);
 };
 
 #endif  // CHROME_BROWSER_PERMISSIONS_PERMISSION_REQUEST_H_