summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-28 21:37:34 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-28 21:37:34 +0000
commit2fb4914745320a7e168c0cb7045c3af72cef7e4a (patch)
tree8cf773762d240eacc01af99121517c91e3334026
parent8918f99dbc48ab2cf69e1ad97e4277af33f51e48 (diff)
downloadchromium_src-2fb4914745320a7e168c0cb7045c3af72cef7e4a.zip
chromium_src-2fb4914745320a7e168c0cb7045c3af72cef7e4a.tar.gz
chromium_src-2fb4914745320a7e168c0cb7045c3af72cef7e4a.tar.bz2
Move ui/resources/win/app_list_user_indicator.png to common
https://codereview.chromium.org/214593010/ is missing 200 percent resource. This CL replaces it. BUG=357351 TBR=mgiuca@chromium.org Review URL: https://codereview.chromium.org/217593002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260286 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--ui/resources/default_100_percent/common/app_list_user_indicator.png (renamed from ui/resources/default_100_percent/win/app_list_user_indicator.png)bin143 -> 143 bytes
-rw-r--r--ui/resources/default_200_percent/common/app_list_user_indicator.png (renamed from ui/resources/default_200_percent/win/app_list_user_indicator.png)bin465 -> 465 bytes
-rw-r--r--ui/resources/ui_resources.grd2
3 files changed, 1 insertions, 1 deletions
diff --git a/ui/resources/default_100_percent/win/app_list_user_indicator.png b/ui/resources/default_100_percent/common/app_list_user_indicator.png
index 77f5858..77f5858 100644
--- a/ui/resources/default_100_percent/win/app_list_user_indicator.png
+++ b/ui/resources/default_100_percent/common/app_list_user_indicator.png
Binary files differ
diff --git a/ui/resources/default_200_percent/win/app_list_user_indicator.png b/ui/resources/default_200_percent/common/app_list_user_indicator.png
index 9fb3a48..9fb3a48 100644
--- a/ui/resources/default_200_percent/win/app_list_user_indicator.png
+++ b/ui/resources/default_200_percent/common/app_list_user_indicator.png
Binary files differ
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index dbb4d04..ee03db9 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -28,7 +28,7 @@
<structure type="chrome_scaled_image" name="IDR_APP_LIST_SPEECH_MIC_OFF" file="common/app_list_mic_off.png" />
<structure type="chrome_scaled_image" name="IDR_APP_LIST_SPEECH_MIC_RECORDING" file="common/app_list_mic_recording.png" />
<if expr="is_win">
- <structure type="chrome_scaled_image" name="IDR_APP_LIST_USER_INDICATOR" file="win/app_list_user_indicator.png" />
+ <structure type="chrome_scaled_image" name="IDR_APP_LIST_USER_INDICATOR" file="common/app_list_user_indicator.png" />
</if>
</if>
<if expr="toolkit_views">