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

Side by Side Diff: chrome/browser/profiles/profile.cc

Issue 5633008: Remove BrowserFileSystemContext class (merge into SandboxedFSContext) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 10 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/profiles/profile.h ('k') | chrome/browser/profiles/profile_impl.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/profiles/profile.h" 5 #include "chrome/browser/profiles/profile.h"
6 6
7 #include "app/resource_bundle.h" 7 #include "app/resource_bundle.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
11 #include "base/path_service.h" 11 #include "base/path_service.h"
12 #include "base/scoped_ptr.h" 12 #include "base/scoped_ptr.h"
13 #include "base/string_util.h" 13 #include "base/string_util.h"
14 #include "chrome/browser/background_contents_service.h" 14 #include "chrome/browser/background_contents_service.h"
15 #include "chrome/browser/browser_list.h" 15 #include "chrome/browser/browser_list.h"
16 #include "chrome/browser/browser_process.h" 16 #include "chrome/browser/browser_process.h"
17 #include "chrome/browser/browser_thread.h" 17 #include "chrome/browser/browser_thread.h"
18 #include "chrome/browser/chrome_blob_storage_context.h" 18 #include "chrome/browser/chrome_blob_storage_context.h"
19 #include "chrome/browser/download/download_manager.h" 19 #include "chrome/browser/download/download_manager.h"
20 #include "chrome/browser/extensions/extension_message_service.h" 20 #include "chrome/browser/extensions/extension_message_service.h"
21 #include "chrome/browser/extensions/extension_process_manager.h" 21 #include "chrome/browser/extensions/extension_process_manager.h"
22 #include "chrome/browser/file_system/browser_file_system_context.h" 22 #include "chrome/browser/file_system/browser_file_system_helper.h"
23 #include "chrome/browser/in_process_webkit/webkit_context.h" 23 #include "chrome/browser/in_process_webkit/webkit_context.h"
24 #include "chrome/browser/net/chrome_url_request_context.h" 24 #include "chrome/browser/net/chrome_url_request_context.h"
25 #include "chrome/browser/notifications/desktop_notification_service.h" 25 #include "chrome/browser/notifications/desktop_notification_service.h"
26 #include "chrome/browser/ssl/ssl_host_state.h" 26 #include "chrome/browser/ssl/ssl_host_state.h"
27 #include "chrome/browser/sync/profile_sync_service.h" 27 #include "chrome/browser/sync/profile_sync_service.h"
28 #include "chrome/browser/themes/browser_theme_provider.h" 28 #include "chrome/browser/themes/browser_theme_provider.h"
29 #include "chrome/browser/ui/find_bar/find_bar_state.h" 29 #include "chrome/browser/ui/find_bar/find_bar_state.h"
30 #include "chrome/common/chrome_constants.h" 30 #include "chrome/common/chrome_constants.h"
31 #include "chrome/common/chrome_paths.h" 31 #include "chrome/common/chrome_paths.h"
32 #include "chrome/common/chrome_switches.h" 32 #include "chrome/common/chrome_switches.h"
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 } 330 }
331 331
332 virtual bool HasCreatedDownloadManager() const { 332 virtual bool HasCreatedDownloadManager() const {
333 return (download_manager_.get() != NULL); 333 return (download_manager_.get() != NULL);
334 } 334 }
335 335
336 virtual PersonalDataManager* GetPersonalDataManager() { 336 virtual PersonalDataManager* GetPersonalDataManager() {
337 return NULL; 337 return NULL;
338 } 338 }
339 339
340 virtual BrowserFileSystemContext* GetFileSystemContext() { 340 virtual fileapi::SandboxedFileSystemContext* GetFileSystemContext() {
341 if (!browser_file_system_context_) 341 if (!file_system_context_)
342 browser_file_system_context_ = new BrowserFileSystemContext( 342 file_system_context_ = CreateFileSystemContext(
343 GetPath(), IsOffTheRecord()); 343 GetPath(), IsOffTheRecord());
344 DCHECK(browser_file_system_context_.get()); 344 DCHECK(file_system_context_.get());
345 return browser_file_system_context_.get(); 345 return file_system_context_.get();
346 } 346 }
347 347
348 virtual void InitThemes() { 348 virtual void InitThemes() {
349 profile_->InitThemes(); 349 profile_->InitThemes();
350 } 350 }
351 351
352 virtual void SetTheme(const Extension* extension) { 352 virtual void SetTheme(const Extension* extension) {
353 profile_->SetTheme(extension); 353 profile_->SetTheme(extension);
354 } 354 }
355 355
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
662 scoped_refptr<webkit_database::DatabaseTracker> db_tracker_; 662 scoped_refptr<webkit_database::DatabaseTracker> db_tracker_;
663 663
664 FilePath last_selected_directory_; 664 FilePath last_selected_directory_;
665 665
666 // Tracks all BackgroundContents running under this profile. 666 // Tracks all BackgroundContents running under this profile.
667 scoped_ptr<BackgroundContentsService> background_contents_service_; 667 scoped_ptr<BackgroundContentsService> background_contents_service_;
668 668
669 scoped_refptr<ChromeBlobStorageContext> blob_storage_context_; 669 scoped_refptr<ChromeBlobStorageContext> blob_storage_context_;
670 670
671 // The file_system context for this profile. 671 // The file_system context for this profile.
672 scoped_refptr<BrowserFileSystemContext> browser_file_system_context_; 672 scoped_refptr<fileapi::SandboxedFileSystemContext> file_system_context_;
673 673
674 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl); 674 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl);
675 }; 675 };
676 676
677 Profile* Profile::CreateOffTheRecordProfile() { 677 Profile* Profile::CreateOffTheRecordProfile() {
678 return new OffTheRecordProfileImpl(this); 678 return new OffTheRecordProfileImpl(this);
679 } 679 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile.h ('k') | chrome/browser/profiles/profile_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698