Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(221)

Side by Side Diff: chrome/browser/importer/external_process_importer_client.cc

Issue 8817013: Revert 113027 - Zygote most of the uses of the utility process on Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/extensions/sandboxed_extension_unpacker.cc ('k') | content/app/content_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/importer/external_process_importer_client.h" 5 #include "chrome/browser/importer/external_process_importer_client.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/string_number_conversions.h" 8 #include "base/string_number_conversions.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/importer/external_process_importer_host.h" 10 #include "chrome/browser/importer/external_process_importer_host.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 BrowserThread::IO, FROM_HERE, 70 BrowserThread::IO, FROM_HERE,
71 base::Bind(&ExternalProcessImporterClient::StartProcessOnIOThread, 71 base::Bind(&ExternalProcessImporterClient::StartProcessOnIOThread,
72 this, 72 this,
73 thread_id)); 73 thread_id));
74 } 74 }
75 75
76 void ExternalProcessImporterClient::StartProcessOnIOThread( 76 void ExternalProcessImporterClient::StartProcessOnIOThread(
77 BrowserThread::ID thread_id) { 77 BrowserThread::ID thread_id) {
78 utility_process_host_ = new UtilityProcessHost(this, thread_id); 78 utility_process_host_ = new UtilityProcessHost(this, thread_id);
79 utility_process_host_->set_no_sandbox(true); 79 utility_process_host_->set_no_sandbox(true);
80 utility_process_host_->set_use_linux_zygote(false);
81 80
82 #if defined(OS_MACOSX) 81 #if defined(OS_MACOSX)
83 base::environment_vector env; 82 base::environment_vector env;
84 std::string dylib_path = GetFirefoxDylibPath().value(); 83 std::string dylib_path = GetFirefoxDylibPath().value();
85 if (!dylib_path.empty()) 84 if (!dylib_path.empty())
86 env.push_back(std::make_pair("DYLD_FALLBACK_LIBRARY_PATH", dylib_path)); 85 env.push_back(std::make_pair("DYLD_FALLBACK_LIBRARY_PATH", dylib_path));
87 utility_process_host_->set_env(env); 86 utility_process_host_->set_env(env);
88 #endif 87 #endif
89 88
90 // Dictionary of all localized strings that could be needed by the importer 89 // Dictionary of all localized strings that could be needed by the importer
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 template_url_vec.reserve(template_urls.size()); 302 template_url_vec.reserve(template_urls.size());
304 std::vector<TemplateURL>::const_iterator iter; 303 std::vector<TemplateURL>::const_iterator iter;
305 for (iter = template_urls.begin(); 304 for (iter = template_urls.begin();
306 iter != template_urls.end(); 305 iter != template_urls.end();
307 ++iter) { 306 ++iter) {
308 template_url_vec.push_back(new TemplateURL(*iter)); 307 template_url_vec.push_back(new TemplateURL(*iter));
309 } 308 }
310 bridge_->SetKeywords(template_url_vec, default_keyword_index, 309 bridge_->SetKeywords(template_url_vec, default_keyword_index,
311 unique_on_host_and_path); 310 unique_on_host_and_path);
312 } 311 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/sandboxed_extension_unpacker.cc ('k') | content/app/content_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698