diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-10 03:41:45 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-10 03:41:45 +0000 |
| commit | 650b2d5cdcab7d2c473c00d15b9f343f3a3405bb (patch) | |
| tree | 1343ea25d7d6086ac1279e1e0e32562b3b9b3477 /chrome/browser/chromeos/customization_document.cc | |
| parent | 6f3638708ff440a2e80662ce49acc41cdad51ecd (diff) | |
| download | chromium_src-650b2d5cdcab7d2c473c00d15b9f343f3a3405bb.zip chromium_src-650b2d5cdcab7d2c473c00d15b9f343f3a3405bb.tar.gz chromium_src-650b2d5cdcab7d2c473c00d15b9f343f3a3405bb.tar.bz2 | |
Merge branch 'master' into file_path_browser
version control markers
Merge branch 'master' into file_path_browser
remove version control
Fix typo
Merge branch 'master' into file_path_browser
Conflicts:
chrome/browser/intents/native_services_browsertest.cc
chrome/browser/ui/intents/native_file_picker_service.cc
Merge branch 'master' into file_path_browser
Conflicts:
chrome/browser/chromeos/drive/drive_file_system.cc
chrome/browser/chromeos/drive/drive_file_system.h
chrome/browser/chromeos/drive/drive_file_system_interface.h
chrome/browser/chromeos/drive/drive_file_system_unittest.cc
chrome/browser/chromeos/drive/file_system/drive_operations.cc
chrome/browser/chromeos/login/wallpaper_manager.cc
chrome/browser/chromeos/login/wallpaper_manager.h
chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc
chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc
chrome/browser/google_apis/gdata_wapi_operations.cc
chrome/browser/google_apis/gdata_wapi_operations.h
chrome/browser/google_apis/gdata_wapi_operations_unittest.cc
chrome/browser/profiles/off_the_record_profile_impl.cc
chrome/browser/profiles/off_the_record_profile_impl.h
chrome/browser/profiles/profile_impl.cc
chrome/browser/profiles/profile_impl.h
chrome/browser/profiles/profile_impl_io_data.cc
chrome/browser/profiles/profile_impl_io_data.h
chrome/browser/sync_file_system/drive_file_sync_client_unittest.cc
chrome/browser/ui/webui/options/manage_profile_handler.cc
Long lines
long lines
some long lines.
long lines
long lines
Beginning of lines.
Rename FilePath -> base::FilePath in chrome/browser
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181638 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/customization_document.cc')
| -rw-r--r-- | chrome/browser/chromeos/customization_document.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/customization_document.cc b/chrome/browser/chromeos/customization_document.cc index 052ef2a..bad0dc9 100644 --- a/chrome/browser/chromeos/customization_document.cc +++ b/chrome/browser/chromeos/customization_document.cc @@ -80,7 +80,7 @@ CustomizationDocument::CustomizationDocument( CustomizationDocument::~CustomizationDocument() {} bool CustomizationDocument::LoadManifestFromFile( - const FilePath& manifest_path) { + const base::FilePath& manifest_path) { std::string manifest; if (!file_util::ReadFileToString(manifest_path, &manifest)) return false; @@ -146,7 +146,7 @@ StartupCustomizationDocument::StartupCustomizationDocument() // Loading manifest causes us to do blocking IO on UI thread. // Temporarily allow it until we fix http://crosbug.com/11103 base::ThreadRestrictions::ScopedAllowIO allow_io; - LoadManifestFromFile(FilePath(kStartupCustomizationManifestPath)); + LoadManifestFromFile(base::FilePath(kStartupCustomizationManifestPath)); } Init(chromeos::system::StatisticsProvider::GetInstance()); } @@ -270,13 +270,14 @@ void ServicesCustomizationDocument::StartFetching() { BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, base::Bind(&ServicesCustomizationDocument::ReadFileInBackground, base::Unretained(this), // this class is a singleton. - FilePath(url_.path()))); + base::FilePath(url_.path()))); } else { StartFileFetch(); } } -void ServicesCustomizationDocument::ReadFileInBackground(const FilePath& file) { +void ServicesCustomizationDocument::ReadFileInBackground( + const base::FilePath& file) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); std::string manifest; |