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

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

Issue 9429039: Cleanup: Remove base::environment_vector and base::file_handle_mapping_vector to StudlyCaps. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 10 months 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 thread_id)); 74 thread_id));
75 } 75 }
76 76
77 void ExternalProcessImporterClient::StartProcessOnIOThread( 77 void ExternalProcessImporterClient::StartProcessOnIOThread(
78 BrowserThread::ID thread_id) { 78 BrowserThread::ID thread_id) {
79 utility_process_host_ = 79 utility_process_host_ =
80 UtilityProcessHost::Create(this, thread_id)->AsWeakPtr(); 80 UtilityProcessHost::Create(this, thread_id)->AsWeakPtr();
81 utility_process_host_->DisableSandbox(); 81 utility_process_host_->DisableSandbox();
82 82
83 #if defined(OS_MACOSX) 83 #if defined(OS_MACOSX)
84 base::environment_vector env; 84 base::EnvironmentVector env;
85 std::string dylib_path = GetFirefoxDylibPath().value(); 85 std::string dylib_path = GetFirefoxDylibPath().value();
86 if (!dylib_path.empty()) 86 if (!dylib_path.empty())
87 env.push_back(std::make_pair("DYLD_FALLBACK_LIBRARY_PATH", dylib_path)); 87 env.push_back(std::make_pair("DYLD_FALLBACK_LIBRARY_PATH", dylib_path));
88 utility_process_host_->SetEnv(env); 88 utility_process_host_->SetEnv(env);
89 #endif 89 #endif
90 90
91 // Dictionary of all localized strings that could be needed by the importer 91 // Dictionary of all localized strings that could be needed by the importer
92 // in the external process. 92 // in the external process.
93 DictionaryValue localized_strings; 93 DictionaryValue localized_strings;
94 localized_strings.SetString( 94 localized_strings.SetString(
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 template_url_vec.reserve(template_urls.size()); 303 template_url_vec.reserve(template_urls.size());
304 std::vector<TemplateURL>::const_iterator iter; 304 std::vector<TemplateURL>::const_iterator iter;
305 for (iter = template_urls.begin(); 305 for (iter = template_urls.begin();
306 iter != template_urls.end(); 306 iter != template_urls.end();
307 ++iter) { 307 ++iter) {
308 template_url_vec.push_back(new TemplateURL(*iter)); 308 template_url_vec.push_back(new TemplateURL(*iter));
309 } 309 }
310 bridge_->SetKeywords(template_url_vec, default_keyword_index, 310 bridge_->SetKeywords(template_url_vec, default_keyword_index,
311 unique_on_host_and_path); 311 unique_on_host_and_path);
312 } 312 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/process_proxy/process_proxy.cc ('k') | chrome/browser/importer/firefox_importer_unittest_utils_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698