Move more vector icons to more appropriate directories.

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 "components/content_settings/core/common/content_settings_types.h"
 #include "content/public/browser/permission_type.h"
 #include "url/gurl.h"
 
 namespace gfx {
-enum class VectorIconId;
+struct VectorIcon;
 }
 
 // Used for UMA to record the types of permission prompts shown.
 // This corresponds to the PermissionRequestType enum in
 // src/tools/metrics/histograms.xml. The usual rules of updating UMA values
 // applies to this enum:
 // - don't remove values
 // - only ever add values at the end
 // - keep the PermissionRequestType enum in sync with this definition.
 enum class PermissionRequestType {
@@ skipping 32 matching lines @@
 // 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.
   typedef int IconId;
 #else
-  // On desktop, we use a vector icon id.
-  typedef gfx::VectorIconId IconId;
+  // On desktop, we use a vector icon.
+  typedef const gfx::VectorIcon& IconId;
 #endif
 
   PermissionRequest();
   virtual ~PermissionRequest() {}
 
   // The icon to use next to the message text fragment in the permission bubble.
   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
@@ skipping 42 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_