Commit 1fd35f9b authored by Clark DuVall's avatar Clark DuVall Committed by Commit Bot

Fix permission icons in Clank

The includes need to be in the same order in ResourceId.template and
resource_mapper.cc. https://crrev.com/c/2091496 added page info icons,
but the includes were swapped in ResourceId.template.

Bug: 1066410
Change-Id: Idb465a017891cf5610191ebe8d304b2c580e5f30
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2130808Reviewed-by: default avatarScott Violet <sky@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Auto-Submit: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#755142}
parent c7f52f21
...@@ -12,8 +12,8 @@ class ResourceId { ...@@ -12,8 +12,8 @@ class ResourceId {
#define LINK_RESOURCE_ID(c_id,java_id) java_id, #define LINK_RESOURCE_ID(c_id,java_id) java_id,
#define DECLARE_RESOURCE_ID(c_id,java_id) java_id, #define DECLARE_RESOURCE_ID(c_id,java_id) java_id,
#include "chrome/browser/android/resource_id.h" #include "chrome/browser/android/resource_id.h"
#include "components/resources/android/permissions_resource_id.h"
#include "components/resources/android/page_info_resource_id.h" #include "components/resources/android/page_info_resource_id.h"
#include "components/resources/android/permissions_resource_id.h"
}; };
return resourceList; return resourceList;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment