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, 8 insertions, 8 deletions

diff --git a/chrome/browser/extensions/api/file_system/file_system_api.h b/chrome/browser/extensions/api/file_system/file_system_api.h
index 6e5e58a..6e72a0f 100644
--- a/chrome/browser/extensions/api/file_system/file_system_api.h
+++ b/chrome/browser/extensions/api/file_system/file_system_api.h
@@ -35,12 +35,12 @@ class FileSystemEntryFunction : public AsyncExtensionFunction {
   // Called on the FILE thread. This is called when a writable file entry is
   // being returned. The function will ensure the file exists, creating it if
   // necessary, and also check that the file is not a link.
-  void CheckWritableFile(const FilePath& path);
+  void CheckWritableFile(const base::FilePath& path);
 
   // This will finish the choose file process. This is either called directly
   // from FileSelected, or from CreateFileIfNecessary. It is called on the UI
   // thread.
-  void RegisterFileSystemAndSendResponse(const FilePath& path,
+  void RegisterFileSystemAndSendResponse(const base::FilePath& path,
                                          EntryType entry_type);
 
   // called on the UI thread if there is a problem checking a writable file.
@@ -70,7 +70,7 @@ class FileSystemIsWritableEntryFunction : public SyncExtensionFunction {
 class FileSystemChooseEntryFunction : public FileSystemEntryFunction {
  public:
   // Allow picker UI to be skipped in testing.
-  static void SkipPickerAndAlwaysSelectPathForTest(FilePath* path);
+  static void SkipPickerAndAlwaysSelectPathForTest(base::FilePath* path);
   static void SkipPickerAndAlwaysCancelForTest();
   static void StopSkippingPickerForTest();
 
@@ -81,26 +81,26 @@ class FileSystemChooseEntryFunction : public FileSystemEntryFunction {
 
   static void BuildFileTypeInfo(
       ui::SelectFileDialog::FileTypeInfo* file_type_info,
-      const FilePath::StringType& suggested_extension,
+      const base::FilePath::StringType& suggested_extension,
       const AcceptOptions* accepts,
       const bool* acceptsAllTypes);
   static void BuildSuggestion(const std::string* opt_name,
-                              FilePath* suggested_name,
-                              FilePath::StringType* suggested_extension);
+                              base::FilePath* suggested_name,
+                              base::FilePath::StringType* suggested_extension);
 
  protected:
   class FilePicker;
 
   virtual ~FileSystemChooseEntryFunction() {}
   virtual bool RunImpl() OVERRIDE;
-  bool ShowPicker(const FilePath& suggested_path,
+  bool ShowPicker(const base::FilePath& suggested_path,
                   const ui::SelectFileDialog::FileTypeInfo& file_type_info,
                   ui::SelectFileDialog::Type picker_type,
                   EntryType entry_type);
 
  private:
   // FileSelected and FileSelectionCanceled are called by the file picker.
-  void FileSelected(const FilePath& path, EntryType entry_type);
+  void FileSelected(const base::FilePath& path, EntryType entry_type);
   void FileSelectionCanceled();
 };