cefclient: Rename the res/ folder to resources/ (issue #1500).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@2011 5089003a-bbd8-11dd-ad1f-f1f9622dbc98

cef.gyp

@@ -402,7 +402,7 @@
         'tests/cefclient/client_switches.cc',
         'tests/cefclient/client_switches.h',
         'tests/cefclient/resource_util.h',
-        'tests/cefclient/res/osr_test.html',
+        'tests/cefclient/resources/osr_test.html',
         'tests/unittests/browser_info_map_unittest.cc',
         'tests/unittests/command_line_unittest.cc',
         'tests/unittests/cookie_unittest.cc',
@@ -447,7 +447,7 @@
         'tests/unittests/zip_reader_unittest.cc',
       ],
       'mac_bundle_resources': [
-        'tests/cefclient/res/osr_test.html',
+        'tests/cefclient/resources/osr_test.html',
         'tests/unittests/mac/unittests.icns',
         'tests/unittests/mac/English.lproj/InfoPlist.strings',
         'tests/unittests/mac/English.lproj/MainMenu.xib',
@@ -586,7 +586,7 @@
             {
               'destination': '<(PRODUCT_DIR)/files',
               'files': [
-                'tests/cefclient/res/osr_test.html',
+                'tests/cefclient/resources/osr_test.html',
               ],
             },
           ],

cef_paths2.gypi

@@ -134,17 +134,17 @@
       '<@(autogen_client_side)',
     ],
     'cefclient_bundle_resources_common': [
-      'tests/cefclient/res/binding.html',
+      'tests/cefclient/resources/binding.html',
-      'tests/cefclient/res/dialogs.html',
+      'tests/cefclient/resources/dialogs.html',
-      'tests/cefclient/res/localstorage.html',
+      'tests/cefclient/resources/localstorage.html',
-      'tests/cefclient/res/logo.png',
+      'tests/cefclient/resources/logo.png',
-      'tests/cefclient/res/osr_test.html',
+      'tests/cefclient/resources/osr_test.html',
-      'tests/cefclient/res/other_tests.html',
+      'tests/cefclient/resources/other_tests.html',
-      'tests/cefclient/res/performance.html',
+      'tests/cefclient/resources/performance.html',
-      'tests/cefclient/res/performance2.html',
+      'tests/cefclient/resources/performance2.html',
-      'tests/cefclient/res/transparency.html',
+      'tests/cefclient/resources/transparency.html',
-      'tests/cefclient/res/window.html',
+      'tests/cefclient/resources/window.html',
-      'tests/cefclient/res/xmlhttprequest.html',
+      'tests/cefclient/resources/xmlhttprequest.html',
     ],
     'cefclient_sources_common': [
       'tests/cefclient/binding_test.cc',
@@ -215,8 +215,8 @@
       'tests/cefclient/osr_window_win.cc',
       'tests/cefclient/osr_window_win.h',
       'tests/cefclient/resource.h',
-      'tests/cefclient/res/cefclient.ico',
+      'tests/cefclient/resources/cefclient.ico',
-      'tests/cefclient/res/small.ico',
+      'tests/cefclient/resources/small.ico',
       'tests/cefclient/resource_util_win.cc',
       'tests/cefclient/root_window_win.cc',
       'tests/cefclient/root_window_win.h',

tests/cefclient/CMakeLists.txt.in

@@ -80,7 +80,7 @@ if(OS_LINUX)
   # Copy cefclient resource files to the target output directory.
   COPY_FILES("${CEF_TARGET}" "${CEFCLIENT_RESOURCES_SRCS}" "${CMAKE_CURRENT_SOURCE_DIR}" "${CEF_TARGET_OUT_DIR}")
   # Rename the "res" directory to "files".
-  RENAME_DIRECTORY("${CEF_TARGET}" "${CEF_TARGET_OUT_DIR}/res" "${CEF_TARGET_OUT_DIR}/files")
+  RENAME_DIRECTORY("${CEF_TARGET}" "${CEF_TARGET_OUT_DIR}/resources" "${CEF_TARGET_OUT_DIR}/files")
 
   # Set SUID permissions on the chrome-sandbox target.
   SET_LINUX_SUID_PERMISSIONS("${CEF_TARGET}" "${CEF_TARGET_OUT_DIR}/chrome-sandbox")
@@ -143,7 +143,7 @@ if(OS_MACOSX)
   if(NOT ${CMAKE_GENERATOR} STREQUAL "Xcode")
     # Manually process and copy over resource files.
     # The Xcode generator handles this via the set_target_properties RESOURCE directive.
-    set(PREFIXES "mac/" "res/")  # Remove these prefixes from input file paths.
+    set(PREFIXES "mac/" "resources/")  # Remove these prefixes from input file paths.
     COPY_MACOSX_RESOURCES("${CEFCLIENT_RESOURCES_SRCS}" "${PREFIXES}" "${CEF_TARGET}" "${CMAKE_CURRENT_SOURCE_DIR}" "${CEF_APP}")
   endif()
 endif()

tests/cefclient/cefclient.rc

@@ -28,17 +28,17 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // Binary
 //
 
-IDS_BINDING BINARY "res\\binding.html"
+IDS_BINDING BINARY "resources\\binding.html"
-IDS_DIALOGS BINARY "res\\dialogs.html"
+IDS_DIALOGS BINARY "resources\\dialogs.html"
-IDS_LOCALSTORAGE BINARY "res\\localstorage.html"
+IDS_LOCALSTORAGE BINARY "resources\\localstorage.html"
-IDS_LOGO BINARY "res\\logo.png"
+IDS_LOGO BINARY "resources\\logo.png"
-IDS_OSRTEST BINARY "res\\osr_test.html"
+IDS_OSRTEST BINARY "resources\\osr_test.html"
-IDS_OTHER_TESTS BINARY "res\\other_tests.html"
+IDS_OTHER_TESTS BINARY "resources\\other_tests.html"
-IDS_PERFORMANCE BINARY "res\\performance.html"
+IDS_PERFORMANCE BINARY "resources\\performance.html"
-IDS_PERFORMANCE2 BINARY "res\\performance2.html"
+IDS_PERFORMANCE2 BINARY "resources\\performance2.html"
-IDS_TRANSPARENCY BINARY "res\\transparency.html"
+IDS_TRANSPARENCY BINARY "resources\\transparency.html"
-IDS_WINDOW BINARY "res\\window.html"
+IDS_WINDOW BINARY "resources\\window.html"
-IDS_XMLHTTPREQUEST BINARY "res\\xmlhttprequest.html"
+IDS_XMLHTTPREQUEST BINARY "resources\\xmlhttprequest.html"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -47,8 +47,8 @@ IDS_XMLHTTPREQUEST BINARY "res\\xmlhttprequest.html"
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_CEFCLIENT           ICON                    "res\cefclient.ico"
+IDI_CEFCLIENT           ICON                    "resources\cefclient.ico"
-IDI_SMALL               ICON                    "res\small.ico"
+IDI_SMALL               ICON                    "resources\small.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //