From 8fe95d54d99fab3c9639824d07253e2940bae489 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Fri, 30 Jan 2015 20:26:16 +0000 Subject: [PATCH] cefclient: Windows: Move icon files to a new resources/win folder (issue #1500). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@2012 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- cef_paths2.gypi | 4 ++-- tests/cefclient/cefclient.rc | 4 ++-- tests/cefclient/resources/{ => win}/cefclient.ico | Bin tests/cefclient/resources/{ => win}/small.ico | Bin 4 files changed, 4 insertions(+), 4 deletions(-) rename tests/cefclient/resources/{ => win}/cefclient.ico (100%) rename tests/cefclient/resources/{ => win}/small.ico (100%) diff --git a/cef_paths2.gypi b/cef_paths2.gypi index cb94bfb83..c7abedfdf 100644 --- a/cef_paths2.gypi +++ b/cef_paths2.gypi @@ -215,8 +215,8 @@ 'tests/cefclient/osr_window_win.cc', 'tests/cefclient/osr_window_win.h', 'tests/cefclient/resource.h', - 'tests/cefclient/resources/cefclient.ico', - 'tests/cefclient/resources/small.ico', + 'tests/cefclient/resources/win/cefclient.ico', + 'tests/cefclient/resources/win/small.ico', 'tests/cefclient/resource_util_win.cc', 'tests/cefclient/root_window_win.cc', 'tests/cefclient/root_window_win.h', diff --git a/tests/cefclient/cefclient.rc b/tests/cefclient/cefclient.rc index b21dc59fe..407b01cb5 100644 --- a/tests/cefclient/cefclient.rc +++ b/tests/cefclient/cefclient.rc @@ -47,8 +47,8 @@ IDS_XMLHTTPREQUEST BINARY "resources\\xmlhttprequest.html" // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_CEFCLIENT ICON "resources\cefclient.ico" -IDI_SMALL ICON "resources\small.ico" +IDI_CEFCLIENT ICON "resources\win\cefclient.ico" +IDI_SMALL ICON "resources\win\small.ico" ///////////////////////////////////////////////////////////////////////////// // diff --git a/tests/cefclient/resources/cefclient.ico b/tests/cefclient/resources/win/cefclient.ico similarity index 100% rename from tests/cefclient/resources/cefclient.ico rename to tests/cefclient/resources/win/cefclient.ico diff --git a/tests/cefclient/resources/small.ico b/tests/cefclient/resources/win/small.ico similarity index 100% rename from tests/cefclient/resources/small.ico rename to tests/cefclient/resources/win/small.ico