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

1 files changed, 16 insertions, 15 deletions

diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome/browser/download/chrome_download_manager_delegate.h
index 93a6e28..ff64439 100644
--- a/chrome/browser/download/chrome_download_manager_delegate.h
+++ b/chrome/browser/download/chrome_download_manager_delegate.h
@@ -50,7 +50,7 @@ class ChromeDownloadManagerDelegate
   // Callback type used with ChooseDownloadPath(). The callback should be
   // invoked with the user-selected path as the argument. If the file selection
   // was canceled, the argument should be the empty path.
-  typedef base::Callback<void(const FilePath&)> FileSelectedCallback;
+  typedef base::Callback<void(const base::FilePath&)> FileSelectedCallback;
 
   explicit ChromeDownloadManagerDelegate(Profile* profile);
 
@@ -68,7 +68,8 @@ class ChromeDownloadManagerDelegate
       const content::DownloadTargetCallback& callback) OVERRIDE;
   virtual content::WebContents*
       GetAlternativeWebContentsToNotifyForDownload() OVERRIDE;
-  virtual bool ShouldOpenFileBasedOnExtension(const FilePath& path) OVERRIDE;
+  virtual bool ShouldOpenFileBasedOnExtension(
+      const base::FilePath& path) OVERRIDE;
   virtual bool ShouldCompleteDownload(
       content::DownloadItem* item,
       const base::Closure& complete_callback) OVERRIDE;
@@ -77,13 +78,13 @@ class ChromeDownloadManagerDelegate
       const content::DownloadOpenDelayedCallback& callback) OVERRIDE;
   virtual bool GenerateFileHash() OVERRIDE;
   virtual void GetSaveDir(content::BrowserContext* browser_context,
-                          FilePath* website_save_dir,
-                          FilePath* download_save_dir,
+                          base::FilePath* website_save_dir,
+                          base::FilePath* download_save_dir,
                           bool* skip_dir_check) OVERRIDE;
   virtual void ChooseSavePath(
       content::WebContents* web_contents,
-      const FilePath& suggested_path,
-      const FilePath::StringType& default_extension,
+      const base::FilePath& suggested_path,
+      const base::FilePath::StringType& default_extension,
       bool can_save_as_complete,
       const content::SavePackagePathPickedCallback& callback) OVERRIDE;
   virtual void OpenDownload(content::DownloadItem* download) OVERRIDE;
@@ -112,7 +113,7 @@ class ChromeDownloadManagerDelegate
   // user action initiated the download, and whether the user has explicitly
   // marked the file type as "auto open". Protected virtual for testing.
   virtual bool IsDangerousFile(const content::DownloadItem& download,
-                               const FilePath& suggested_path,
+                               const base::FilePath& suggested_path,
                                bool visited_referrer_before);
 
   // Obtains a path reservation by calling
@@ -120,8 +121,8 @@ class ChromeDownloadManagerDelegate
   // testing.
   virtual void GetReservedPath(
       content::DownloadItem& download,
-      const FilePath& target_path,
-      const FilePath& default_download_path,
+      const base::FilePath& target_path,
+      const base::FilePath& default_download_path,
       bool should_uniquify_path,
       const DownloadPathReservationTracker::ReservedPathCallback& callback);
 
@@ -131,7 +132,7 @@ class ChromeDownloadManagerDelegate
   // selected full path. If the user cancels the dialog, then an empty FilePath
   // will be passed into |callback|. Protected virtual for testing.
   virtual void ChooseDownloadPath(content::DownloadItem* item,
-                                  const FilePath& suggested_path,
+                                  const base::FilePath& suggested_path,
                                   const FileSelectedCallback& callback);
 
   // So that test classes that inherit from this for override purposes
@@ -180,12 +181,12 @@ class ChromeDownloadManagerDelegate
       bool should_prompt,
       bool is_forced_path,
       content::DownloadDangerType danger_type,
-      const FilePath& unverified_path);
+      const base::FilePath& unverified_path);
 #endif
 
   // Determine the intermediate path to use for |target_path|. |danger_type|
   // specifies the danger level of the download.
-  FilePath GetIntermediatePath(const FilePath& target_path,
+  base::FilePath GetIntermediatePath(const base::FilePath& target_path,
                                content::DownloadDangerType danger_type);
 
   // Called on the UI thread once a reserved path is available. Updates the
@@ -196,7 +197,7 @@ class ChromeDownloadManagerDelegate
       const content::DownloadTargetCallback& callback,
       bool should_prompt,
       content::DownloadDangerType danger_type,
-      const FilePath& reserved_path,
+      const base::FilePath& reserved_path,
       bool reserved_path_verified);
 
   // Called on the UI thread once the final target path is available.
@@ -205,7 +206,7 @@ class ChromeDownloadManagerDelegate
       const content::DownloadTargetCallback& callback,
       content::DownloadItem::TargetDisposition disposition,
       content::DownloadDangerType danger_type,
-      const FilePath& target_path);
+      const base::FilePath& target_path);
 
 #if defined(ENABLE_WEB_INTENTS)
   // Check policy of whether we should open this download with a web intents
@@ -253,7 +254,7 @@ class ChromeDownloadManagerDelegate
 
   // The directory most recently chosen by the user in response to a Save As
   // dialog for a regular download.
-  FilePath last_download_path_;
+  base::FilePath last_download_path_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeDownloadManagerDelegate);
 };