Make PermissionRequest::GetIconId return different types on desktop and Android so that the IDR_ an…

chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.h"
 
 #include <algorithm>
 
 #include "base/mac/bind_objc_block.h"
 #include "base/macros.h"
@@ skipping 494 matching lines @@
   DCHECK(browser_->window());
   return browser_->window()->GetNativeWindow();
 }
 
 - (NSView*)labelForRequest:(PermissionRequest*)request {
   DCHECK(request);
   base::scoped_nsobject<NSView> permissionView(
       [[NSView alloc] initWithFrame:NSZeroRect]);
   base::scoped_nsobject<NSImageView> permissionIcon(
       [[NSImageView alloc] initWithFrame:NSZeroRect]);
-  [permissionIcon setImage:NSImageFromImageSkia(
-      gfx::CreateVectorIcon(request->GetVectorIconId(), 18,
-                            gfx::kChromeIconGrey))];
+  [permissionIcon
+      setImage:NSImageFromImageSkia(gfx::CreateVectorIcon(
+                   request->GetIconId(), 18, gfx::kChromeIconGrey))];
   [permissionIcon setFrameSize:kPermissionIconSize];
   [permissionView addSubview:permissionIcon];
 
   base::scoped_nsobject<NSTextField> permissionLabel(
       [[NSTextField alloc] initWithFrame:NSZeroRect]);
   base::string16 label = request->GetMessageTextFragment();
   [permissionLabel setDrawsBackground:NO];
   [permissionLabel setBezeled:NO];
   [permissionLabel setEditable:NO];
   [permissionLabel setSelectable:NO];
@@ skipping 130 matching lines @@
 
 + (void)alignCenterOf:(NSView*)viewA verticallyToCenterOf:(NSView*)viewB {
   NSRect frameA = [viewA frame];
   NSRect frameB = [viewB frame];
   frameA.origin.y =
       NSMinY(frameB) + std::floor((NSHeight(frameB) - NSHeight(frameA)) / 2);
   [viewA setFrameOrigin:frameA.origin];
 }
 
 @end  // implementation PermissionBubbleController