diff options
| author | msarda@chromium.org <msarda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-10 12:28:22 +0000 |
|---|---|---|
| committer | msarda@chromium.org <msarda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-10 12:28:22 +0000 |
| commit | ef7557ba6ddd06406b1981504698d5fbb2edfacf (patch) | |
| tree | 180e442dad35e05fe878c08140209b33b4f2fb06 /content | |
| parent | 48df2a46210bac1158e9a3009d247f93ff348e69 (diff) | |
| download | chromium_src-ef7557ba6ddd06406b1981504698d5fbb2edfacf.zip chromium_src-ef7557ba6ddd06406b1981504698d5fbb2edfacf.tar.gz chromium_src-ef7557ba6ddd06406b1981504698d5fbb2edfacf.tar.bz2 | |
Build browser_process_sub_thread.cc on iOS.
Adds browser_process_sub_thread.cc to the build on iOS and ifdefs out
BrowserChildProcessHostImpl::TerminateAll() as Chrome on iOS is
single-process.
Review URL: https://chromiumcodereview.appspot.com/11066054
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161091 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/browser_process_sub_thread.cc | 2 | ||||
| -rw-r--r-- | content/content_browser.gypi | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/content/browser/browser_process_sub_thread.cc b/content/browser/browser_process_sub_thread.cc index 942ecd9..9a5b78a 100644 --- a/content/browser/browser_process_sub_thread.cc +++ b/content/browser/browser_process_sub_thread.cc @@ -64,10 +64,12 @@ void BrowserProcessSubThread::IOThreadPreCleanUp() { // Destroy all URLRequests started by URLFetchers. net::URLFetcher::CancelAll(); +#if !defined(OS_IOS) // If any child processes are still running, terminate them and // and delete the BrowserChildProcessHost instances to release whatever // IO thread only resources they are referencing. BrowserChildProcessHostImpl::TerminateAll(); +#endif // !defined(OS_IOS) } } // namespace content diff --git a/content/content_browser.gypi b/content/content_browser.gypi index b42ad50..cf63ad2 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -873,6 +873,7 @@ ['include', '^public/browser/notification_registrar\\.cc$'], ['include', '^public/browser/speech_recognition_'], ['include', '^browser/browser_context\\.cc$'], + ['include', '^browser/browser_process_sub_thread\\.cc$'], ['include', '^browser/notification_service_impl\\.cc$'], ], }, { # OS!="ios" |