From 82655ea01aafcb9000101d9758f2989e7d0024ef Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Mon, 2 Feb 2015 22:33:35 +0000 Subject: [PATCH] cefclient: Move files containing the main() program entry point to the top-level cefclient directory (issue #1500). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@2018 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- cef.gyp | 2 +- cef_paths2.gypi | 8 ++++---- tests/cefclient/{browser => }/cefclient_gtk.cc | 0 tests/cefclient/{browser => }/cefclient_mac.mm | 0 tests/cefclient/{browser => }/cefclient_win.cc | 0 tests/cefclient/{renderer => }/process_helper_mac.cc | 0 6 files changed, 5 insertions(+), 5 deletions(-) rename tests/cefclient/{browser => }/cefclient_gtk.cc (100%) rename tests/cefclient/{browser => }/cefclient_mac.mm (100%) rename tests/cefclient/{browser => }/cefclient_win.cc (100%) rename tests/cefclient/{renderer => }/process_helper_mac.cc (100%) diff --git a/cef.gyp b/cef.gyp index f16c4deb9..f8a181a50 100644 --- a/cef.gyp +++ b/cef.gyp @@ -1549,9 +1549,9 @@ 'tests/cefclient/common/client_app_other.h', 'tests/cefclient/common/client_switches.cc', 'tests/cefclient/common/client_switches.h', + 'tests/cefclient/process_helper_mac.cc', 'tests/cefclient/renderer/client_app_renderer.cc', 'tests/cefclient/renderer/client_app_renderer.h', - 'tests/cefclient/renderer/process_helper_mac.cc', 'tests/unittests/client_app_delegates.cc', 'tests/unittests/cookie_unittest.cc', 'tests/unittests/dom_unittest.cc', diff --git a/cef_paths2.gypi b/cef_paths2.gypi index 0e8d8b905..d0e5747a6 100644 --- a/cef_paths2.gypi +++ b/cef_paths2.gypi @@ -217,7 +217,6 @@ 'tests/cefclient/browser/browser_window_osr_win.h', 'tests/cefclient/browser/browser_window_std_win.cc', 'tests/cefclient/browser/browser_window_std_win.h', - 'tests/cefclient/browser/cefclient_win.cc', 'tests/cefclient/browser/main_context_impl_win.cc', 'tests/cefclient/browser/main_message_loop_multithreaded_win.cc', 'tests/cefclient/browser/main_message_loop_multithreaded_win.h', @@ -233,6 +232,7 @@ 'tests/cefclient/browser/util_win.cc', 'tests/cefclient/browser/util_win.h', 'tests/cefclient/browser/window_test_win.cc', + 'tests/cefclient/cefclient_win.cc', 'tests/cefclient/resources/win/cefclient.exe.manifest', 'tests/cefclient/resources/win/cefclient.ico', 'tests/cefclient/resources/win/cefclient.rc', @@ -247,7 +247,6 @@ 'tests/cefclient/browser/browser_window_osr_mac.mm', 'tests/cefclient/browser/browser_window_std_mac.h', 'tests/cefclient/browser/browser_window_std_mac.mm', - 'tests/cefclient/browser/cefclient_mac.mm', 'tests/cefclient/browser/main_context_impl_posix.cc', 'tests/cefclient/browser/resource_util_mac.mm', 'tests/cefclient/browser/resource_util_posix.cc', @@ -256,11 +255,12 @@ 'tests/cefclient/browser/temp_window_mac.h', 'tests/cefclient/browser/temp_window_mac.mm', 'tests/cefclient/browser/window_test_mac.mm', + 'tests/cefclient/cefclient_mac.mm', '<@(cefclient_sources_browser)', '<@(cefclient_sources_common)', ], 'cefclient_sources_mac_helper': [ - 'tests/cefclient/renderer/process_helper_mac.cc', + 'tests/cefclient/process_helper_mac.cc', '<@(cefclient_sources_common)', '<@(cefclient_sources_renderer)', ], @@ -272,7 +272,6 @@ '<@(cefclient_sources_resources)', ], 'cefclient_sources_linux': [ - 'tests/cefclient/browser/cefclient_gtk.cc', 'tests/cefclient/browser/browser_window_osr_gtk.cc', 'tests/cefclient/browser/browser_window_osr_gtk.h', 'tests/cefclient/browser/browser_window_std_gtk.cc', @@ -289,6 +288,7 @@ 'tests/cefclient/browser/temp_window_x11.cc', 'tests/cefclient/browser/temp_window_x11.h', 'tests/cefclient/browser/window_test_gtk.cc', + 'tests/cefclient/cefclient_gtk.cc', '<@(cefclient_sources_browser)', '<@(cefclient_sources_common)', '<@(cefclient_sources_renderer)', diff --git a/tests/cefclient/browser/cefclient_gtk.cc b/tests/cefclient/cefclient_gtk.cc similarity index 100% rename from tests/cefclient/browser/cefclient_gtk.cc rename to tests/cefclient/cefclient_gtk.cc diff --git a/tests/cefclient/browser/cefclient_mac.mm b/tests/cefclient/cefclient_mac.mm similarity index 100% rename from tests/cefclient/browser/cefclient_mac.mm rename to tests/cefclient/cefclient_mac.mm diff --git a/tests/cefclient/browser/cefclient_win.cc b/tests/cefclient/cefclient_win.cc similarity index 100% rename from tests/cefclient/browser/cefclient_win.cc rename to tests/cefclient/cefclient_win.cc diff --git a/tests/cefclient/renderer/process_helper_mac.cc b/tests/cefclient/process_helper_mac.cc similarity index 100% rename from tests/cefclient/renderer/process_helper_mac.cc rename to tests/cefclient/process_helper_mac.cc