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/settings | |
| 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/settings')
3 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc b/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc index d9d6c69..f316153 100644 --- a/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc +++ b/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc @@ -245,7 +245,7 @@ TEST_F(DeviceSettingsProviderTest, PolicyLoadNotification) { TEST_F(DeviceSettingsProviderTest, StatsReportingMigration) { // Create the legacy consent file. - FilePath consent_file; + base::FilePath consent_file; ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &consent_file)); consent_file = consent_file.AppendASCII("Consent To Send Stats"); ASSERT_EQ(1, file_util::WriteFile(consent_file, "0", 1)); diff --git a/chrome/browser/chromeos/settings/owner_key_util.cc b/chrome/browser/chromeos/settings/owner_key_util.cc index 8bbdc01..e5aee02 100644 --- a/chrome/browser/chromeos/settings/owner_key_util.cc +++ b/chrome/browser/chromeos/settings/owner_key_util.cc @@ -17,7 +17,7 @@ namespace chromeos { // OwnerKeyUtil OwnerKeyUtil* OwnerKeyUtil::Create() { - return new OwnerKeyUtilImpl(FilePath(OwnerKeyUtilImpl::kOwnerKeyFile)); + return new OwnerKeyUtilImpl(base::FilePath(OwnerKeyUtilImpl::kOwnerKeyFile)); } OwnerKeyUtil::OwnerKeyUtil() {} @@ -30,7 +30,7 @@ OwnerKeyUtil::~OwnerKeyUtil() {} // static const char OwnerKeyUtilImpl::kOwnerKeyFile[] = "/var/lib/whitelist/owner.key"; -OwnerKeyUtilImpl::OwnerKeyUtilImpl(const FilePath& key_file) +OwnerKeyUtilImpl::OwnerKeyUtilImpl(const base::FilePath& key_file) : key_file_(key_file) {} OwnerKeyUtilImpl::~OwnerKeyUtilImpl() {} diff --git a/chrome/browser/chromeos/settings/owner_key_util_unittest.cc b/chrome/browser/chromeos/settings/owner_key_util_unittest.cc index 8f62299..9ac917c 100644 --- a/chrome/browser/chromeos/settings/owner_key_util_unittest.cc +++ b/chrome/browser/chromeos/settings/owner_key_util_unittest.cc @@ -59,7 +59,7 @@ class OwnerKeyUtilTest : public testing::Test { } base::ScopedTempDir tmpdir_; - FilePath key_file_; + base::FilePath key_file_; scoped_refptr<OwnerKeyUtil> util_; private: |