diff options
| -rw-r--r-- | ash/ash.gyp | 1 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 6 | ||||
| -rw-r--r-- | chrome/test/gpu/test_support_gpu.gypi | 1 | ||||
| -rw-r--r-- | content/content_shell.gypi | 1 | ||||
| -rw-r--r-- | content/content_tests.gypi | 2 | ||||
| -rw-r--r-- | content/public/app/startup_helper_win.h | 6 | ||||
| -rw-r--r-- | ui/views/views.gyp | 1 |
7 files changed, 15 insertions, 3 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp index 3c41a17..a9d2dd3 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -526,6 +526,7 @@ 'shell/window_watcher.h', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', + '../content/app/startup_helper_win.cc', '../ui/views/test/test_views_delegate.cc', ], 'conditions': [ diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 6fe744f..cdfdd9f 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -513,6 +513,7 @@ 'test/base/chrome_test_launcher.cc', 'test/base/view_event_test_base.cc', 'test/base/view_event_test_base.h', + '../content/app/startup_helper_win.cc', '../content/browser/mouseleave_browsertest.cc', ], 'conditions': [ @@ -3000,6 +3001,7 @@ # TODO(craig): Rename this and run from base_unittests when the test # is safe to run there. See http://crbug.com/78722 for details. '../base/files/file_path_watcher_browsertest.cc', + '../content/app/startup_helper_win.cc', '../content/browser/accessibility/cross_platform_accessibility_browsertest.cc', '../content/browser/accessibility/dump_accessibility_tree_browsertest.cc', '../content/browser/accessibility/dump_accessibility_tree_helper.cc', @@ -3418,6 +3420,7 @@ 'test/perf/browser_perf_test.h', 'test/perf/rendering/latency_tests.cc', 'test/perf/rendering/throughput_tests.cc', + '../content/app/startup_helper_win.cc', ], 'rules': [ { @@ -3563,6 +3566,7 @@ 'app/chrome_dll.rc', 'browser/safe_browsing/safe_browsing_test.cc', 'test/base/chrome_test_launcher.cc', + '../content/app/startup_helper_win.cc', ], 'conditions': [ ['safe_browsing==0', { @@ -3926,6 +3930,7 @@ 'browser/sync/test/integration/two_client_typed_urls_sync_test.cc', 'browser/sync/test/integration/typed_urls_helper.cc', 'browser/sync/test/integration/typed_urls_helper.h', + '../content/app/startup_helper_win.cc', ], 'conditions': [ ['toolkit_uses_gtk == 1', { @@ -4048,6 +4053,7 @@ 'browser/sync/test/integration/typed_urls_helper.h', 'test/base/chrome_test_launcher.cc', 'test/data/resource.rc', + '../content/app/startup_helper_win.cc', ], 'conditions': [ ['toolkit_uses_gtk == 1', { diff --git a/chrome/test/gpu/test_support_gpu.gypi b/chrome/test/gpu/test_support_gpu.gypi index 9712206..3af445c 100644 --- a/chrome/test/gpu/test_support_gpu.gypi +++ b/chrome/test/gpu/test_support_gpu.gypi @@ -34,6 +34,7 @@ ], 'sources': [ '<(src_dir)/chrome/test/base/chrome_test_launcher.cc', + '<(src_dir)/content/app/startup_helper_win.cc', '<(src_dir)/content/test/gpu/test_switches.cc', '<(src_dir)/content/test/gpu/test_switches.h', ], diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 1e12e7f..c8fc373 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -250,6 +250,7 @@ '..', ], 'sources': [ + 'app/startup_helper_win.cc', 'shell/shell_main.cc', ], 'mac_bundle_resources': [ diff --git a/content/content_tests.gypi b/content/content_tests.gypi index d642d7d..5edd339 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -220,6 +220,7 @@ '..', ], 'sources': [ + 'app/startup_helper_win.cc', 'browser/accessibility/browser_accessibility_mac_unittest.mm', 'browser/accessibility/browser_accessibility_manager_unittest.cc', 'browser/accessibility/browser_accessibility_win_unittest.cc', @@ -522,6 +523,7 @@ 'HAS_OUT_OF_PROC_TEST_RUNNER', ], 'sources': [ + 'app/startup_helper_win.cc', 'public/test/test_launcher.h', 'test/content_browser_test.h', 'test/content_browser_test.cc', diff --git a/content/public/app/startup_helper_win.h b/content/public/app/startup_helper_win.h index 7bb3d68..0dcdc61 100644 --- a/content/public/app/startup_helper_win.h +++ b/content/public/app/startup_helper_win.h @@ -6,8 +6,6 @@ #define CONTENT_PUBLIC_APP_STARTUP_HELPER_WIN_H_ #pragma once -#include "content/common/content_export.h" - class CommandLine; namespace sandbox { @@ -16,13 +14,15 @@ struct SandboxInterfaceInfo; // This file contains functions that any embedder that's not using ContentMain // will want to call at startup. +// NOTE: we never want to CONTENT_EXPORT these functions, they must run in the +// same module that calls them. namespace content { // Initializes the sandbox code and turns on DEP. Note: This function // must be *statically* linked into the executable (along with the static // sandbox library); it will not work correctly if it is exported from a // DLL and linked in. -CONTENT_EXPORT void InitializeSandboxInfo( +void InitializeSandboxInfo( sandbox::SandboxInterfaceInfo* sandbox_info); // Register the invalid param handler and pure call handler to be able to diff --git a/ui/views/views.gyp b/ui/views/views.gyp index f7d0fda..d21b64e 100644 --- a/ui/views/views.gyp +++ b/ui/views/views.gyp @@ -694,6 +694,7 @@ '../..', ], 'sources': [ + '../../content/app/startup_helper_win.cc', 'examples/content_client/examples_browser_main_parts.cc', 'examples/content_client/examples_browser_main_parts.h', 'examples/content_client/examples_content_browser_client.cc', |