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

Side by Side Diff: chrome/browser/browser_process_impl.cc

Issue 126223: Replace std:;wstring with std::string in locale-name related APIs.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 6 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
« no previous file with comments | « chrome/browser/browser_process_impl.h ('k') | chrome/browser/character_encoding.h » ('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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/browser_process_impl.h" 5 #include "chrome/browser/browser_process_impl.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "base/clipboard.h" 8 #include "base/clipboard.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 255
256 printing::PrintJobManager* BrowserProcessImpl::print_job_manager() { 256 printing::PrintJobManager* BrowserProcessImpl::print_job_manager() {
257 // TODO(abarth): DCHECK(CalledOnValidThread()); 257 // TODO(abarth): DCHECK(CalledOnValidThread());
258 // See <http://b/1287209>. 258 // See <http://b/1287209>.
259 // print_job_manager_ is initialized in the constructor and destroyed in the 259 // print_job_manager_ is initialized in the constructor and destroyed in the
260 // destructor, so it should always be valid. 260 // destructor, so it should always be valid.
261 DCHECK(print_job_manager_.get()); 261 DCHECK(print_job_manager_.get());
262 return print_job_manager_.get(); 262 return print_job_manager_.get();
263 } 263 }
264 264
265 const std::wstring& BrowserProcessImpl::GetApplicationLocale() { 265 const std::string& BrowserProcessImpl::GetApplicationLocale() {
266 DCHECK(CalledOnValidThread()); 266 DCHECK(CalledOnValidThread());
267 if (locale_.empty()) { 267 if (locale_.empty()) {
268 locale_ = l10n_util::GetApplicationLocale(local_state()->GetString( 268 locale_ = l10n_util::GetApplicationLocale(
269 prefs::kApplicationLocale)); 269 local_state()->GetString(prefs::kApplicationLocale));
270 } 270 }
271 return locale_; 271 return locale_;
272 } 272 }
273 273
274 void BrowserProcessImpl::CreateResourceDispatcherHost() { 274 void BrowserProcessImpl::CreateResourceDispatcherHost() {
275 DCHECK(!created_resource_dispatcher_host_ && 275 DCHECK(!created_resource_dispatcher_host_ &&
276 resource_dispatcher_host_.get() == NULL); 276 resource_dispatcher_host_.get() == NULL);
277 created_resource_dispatcher_host_ = true; 277 created_resource_dispatcher_host_ = true;
278 278
279 resource_dispatcher_host_.reset( 279 resource_dispatcher_host_.reset(
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 #else 399 #else
400 // TODO(port): remove this completely, it has no business being here. 400 // TODO(port): remove this completely, it has no business being here.
401 #endif 401 #endif
402 } 402 }
403 403
404 void BrowserProcessImpl::CreateGoogleURLTracker() { 404 void BrowserProcessImpl::CreateGoogleURLTracker() {
405 DCHECK(google_url_tracker_.get() == NULL); 405 DCHECK(google_url_tracker_.get() == NULL);
406 scoped_ptr<GoogleURLTracker> google_url_tracker(new GoogleURLTracker); 406 scoped_ptr<GoogleURLTracker> google_url_tracker(new GoogleURLTracker);
407 google_url_tracker_.swap(google_url_tracker); 407 google_url_tracker_.swap(google_url_tracker);
408 } 408 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_process_impl.h ('k') | chrome/browser/character_encoding.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698