From 650b2d5cdcab7d2c473c00d15b9f343f3a3405bb Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Sun, 10 Feb 2013 03:41:45 +0000 Subject: 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 --- chrome/browser/platform_util_linux.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'chrome/browser/platform_util_linux.cc') diff --git a/chrome/browser/platform_util_linux.cc b/chrome/browser/platform_util_linux.cc index 2bc84cb..4afe8fd 100644 --- a/chrome/browser/platform_util_linux.cc +++ b/chrome/browser/platform_util_linux.cc @@ -54,8 +54,8 @@ void XDGEmail(const std::string& email) { // TODO(estade): It would be nice to be able to select the file in the file // manager, but that probably requires extending xdg-open. For now just // show the folder. -void ShowItemInFolderOnFileThread(const FilePath& full_path) { - FilePath dir = full_path.DirName(); +void ShowItemInFolderOnFileThread(const base::FilePath& full_path) { + base::FilePath dir = full_path.DirName(); if (!file_util::DirectoryExists(dir)) return; @@ -66,13 +66,13 @@ void ShowItemInFolderOnFileThread(const FilePath& full_path) { namespace platform_util { -void ShowItemInFolder(const FilePath& full_path) { +void ShowItemInFolder(const base::FilePath& full_path) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, base::Bind(&ShowItemInFolderOnFileThread, full_path)); } -void OpenItem(const FilePath& full_path) { +void OpenItem(const base::FilePath& full_path) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, base::Bind(&XDGOpen, full_path.value())); -- cgit v1.1