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

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

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, 5 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.h ('k') | chrome/browser/browser_process_impl.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) 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 // When each service is created, we set a flag indicating this. At this point, 5 // When each service is created, we set a flag indicating this. At this point,
6 // the service initialization could fail or succeed. This allows us to remember 6 // the service initialization could fail or succeed. This allows us to remember
7 // if we tried to create a service, and not try creating it over and over if 7 // if we tried to create a service, and not try creating it over and over if
8 // the creation failed. 8 // the creation failed.
9 9
10 #ifndef CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_ 10 #ifndef CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 178
179 virtual printing::PrintJobManager* print_job_manager(); 179 virtual printing::PrintJobManager* print_job_manager();
180 180
181 virtual GoogleURLTracker* google_url_tracker() { 181 virtual GoogleURLTracker* google_url_tracker() {
182 DCHECK(CalledOnValidThread()); 182 DCHECK(CalledOnValidThread());
183 if (!google_url_tracker_.get()) 183 if (!google_url_tracker_.get())
184 CreateGoogleURLTracker(); 184 CreateGoogleURLTracker();
185 return google_url_tracker_.get(); 185 return google_url_tracker_.get();
186 } 186 }
187 187
188 virtual const std::wstring& GetApplicationLocale(); 188 virtual const std::string& GetApplicationLocale();
189 189
190 virtual MemoryModel memory_model() { 190 virtual MemoryModel memory_model() {
191 DCHECK(CalledOnValidThread()); 191 DCHECK(CalledOnValidThread());
192 return memory_model_; 192 return memory_model_;
193 } 193 }
194 194
195 virtual base::WaitableEvent* shutdown_event() { 195 virtual base::WaitableEvent* shutdown_event() {
196 return shutdown_event_.get(); 196 return shutdown_event_.get();
197 } 197 }
198 198
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 261
262 scoped_ptr<GoogleURLTracker> google_url_tracker_; 262 scoped_ptr<GoogleURLTracker> google_url_tracker_;
263 263
264 scoped_ptr<NotificationService> main_notification_service_; 264 scoped_ptr<NotificationService> main_notification_service_;
265 265
266 unsigned int module_ref_count_; 266 unsigned int module_ref_count_;
267 267
268 // Ensures that all the print jobs are finished before closing the browser. 268 // Ensures that all the print jobs are finished before closing the browser.
269 scoped_ptr<printing::PrintJobManager> print_job_manager_; 269 scoped_ptr<printing::PrintJobManager> print_job_manager_;
270 270
271 std::wstring locale_; 271 std::string locale_;
272 272
273 MemoryModel memory_model_; 273 MemoryModel memory_model_;
274 274
275 bool checked_for_new_frames_; 275 bool checked_for_new_frames_;
276 bool using_new_frames_; 276 bool using_new_frames_;
277 277
278 // This service just sits around and makes thumanails for tabs. It does 278 // This service just sits around and makes thumanails for tabs. It does
279 // nothing in the cosntructor so we don't have to worry about lazy init. 279 // nothing in the cosntructor so we don't have to worry about lazy init.
280 ThumbnailGenerator thumbnail_generator_; 280 ThumbnailGenerator thumbnail_generator_;
281 281
282 // An event that notifies when we are shutting-down. 282 // An event that notifies when we are shutting-down.
283 scoped_ptr<base::WaitableEvent> shutdown_event_; 283 scoped_ptr<base::WaitableEvent> shutdown_event_;
284 284
285 DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl); 285 DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl);
286 }; 286 };
287 287
288 #endif // CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_ 288 #endif // CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/browser/browser_process.h ('k') | chrome/browser/browser_process_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698