diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-23 15:33:38 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-23 15:33:38 +0000 |
| commit | 57fdef4bdc5be776ecd820c2d39e3047f55d6568 (patch) | |
| tree | 803d6742ab2fc39f47374542675ae0e0ee67aaba /chrome/app/chrome_main_delegate.cc | |
| parent | 0ec6d3ba8e3940cb578713aa05c969fd17eb75e9 (diff) | |
| download | chromium_src-57fdef4bdc5be776ecd820c2d39e3047f55d6568.zip chromium_src-57fdef4bdc5be776ecd820c2d39e3047f55d6568.tar.gz chromium_src-57fdef4bdc5be776ecd820c2d39e3047f55d6568.tar.bz2 | |
Cut some more dependencies from browser to child for multiple_dll mode
Removes the in-process implementations for Gpu and Utility.
R=jam@chromium.org, sky@chromium.org
BUG=237249
Review URL: https://codereview.chromium.org/19502003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213126 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_main_delegate.cc')
| -rw-r--r-- | chrome/app/chrome_main_delegate.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc index 4077d3c..10abc01 100644 --- a/chrome/app/chrome_main_delegate.cc +++ b/chrome/app/chrome_main_delegate.cc @@ -93,19 +93,19 @@ #include "chrome/app/breakpad_linux.h" #endif -#if !defined(CHROME_MULTIPLE_DLL) || defined(CHROME_MULTIPLE_DLL_BROWSER) +#if !defined(CHROME_MULTIPLE_DLL_CHILD) base::LazyInstance<chrome::ChromeContentBrowserClient> g_chrome_content_browser_client = LAZY_INSTANCE_INITIALIZER; #endif -#if !defined(CHROME_MULTIPLE_DLL) || defined(CHROME_MULTIPLE_DLL_CHILD) +#if !defined(CHROME_MULTIPLE_DLL_BROWSER) base::LazyInstance<chrome::ChromeContentRendererClient> g_chrome_content_renderer_client = LAZY_INSTANCE_INITIALIZER; base::LazyInstance<chrome::ChromeContentUtilityClient> g_chrome_content_utility_client = LAZY_INSTANCE_INITIALIZER; base::LazyInstance<chrome::ChromeContentPluginClient> g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER; -#endif // !CHROME_MULTIPLE_DLL || CHROME_MULTIPLE_DLL_CHILD +#endif #if defined(OS_POSIX) base::LazyInstance<chrome::ChromeBreakpadClient>::Leaky |