diff options
Diffstat (limited to 'chrome/browser/extensions/api/file_system')
7 files changed, 28 insertions, 28 deletions
diff --git a/chrome/browser/extensions/api/file_system/entry_watcher_service.h b/chrome/browser/extensions/api/file_system/entry_watcher_service.h index 4e88989..a75448e 100644 --- a/chrome/browser/extensions/api/file_system/entry_watcher_service.h +++ b/chrome/browser/extensions/api/file_system/entry_watcher_service.h @@ -61,8 +61,8 @@ class EntryWatcherService : public KeyedService, const std::string& extension_id); // storage::WatcherManager::Observer overrides. - virtual void OnEntryChanged(const storage::FileSystemURL& url) OVERRIDE; - virtual void OnEntryRemoved(const storage::FileSystemURL& url) OVERRIDE; + virtual void OnEntryChanged(const storage::FileSystemURL& url) override; + virtual void OnEntryRemoved(const storage::FileSystemURL& url) override; // Sets a custom dispatcher for tests in order to be able to verify dispatched // events. diff --git a/chrome/browser/extensions/api/file_system/entry_watcher_service_factory.h b/chrome/browser/extensions/api/file_system/entry_watcher_service_factory.h index 36296a4..0fe06fc 100644 --- a/chrome/browser/extensions/api/file_system/entry_watcher_service_factory.h +++ b/chrome/browser/extensions/api/file_system/entry_watcher_service_factory.h @@ -38,8 +38,8 @@ class EntryWatcherServiceFactory : public BrowserContextKeyedServiceFactory { // BrowserContextKeyedServiceFactory overrides: virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* profile) const OVERRIDE; - virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; + content::BrowserContext* profile) const override; + virtual bool ServiceIsCreatedWithBrowserContext() const override; DISALLOW_COPY_AND_ASSIGN(EntryWatcherServiceFactory); }; diff --git a/chrome/browser/extensions/api/file_system/entry_watcher_service_unittest.cc b/chrome/browser/extensions/api/file_system/entry_watcher_service_unittest.cc index 67752a6..80d1cbc 100644 --- a/chrome/browser/extensions/api/file_system/entry_watcher_service_unittest.cc +++ b/chrome/browser/extensions/api/file_system/entry_watcher_service_unittest.cc @@ -36,7 +36,7 @@ class EntryWatcherServiceTest : public testing::Test { EntryWatcherServiceTest() {} virtual ~EntryWatcherServiceTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { profile_.reset(new TestingProfile); ASSERT_TRUE(data_dir_.CreateUniqueTempDir()); file_system_context_ = @@ -53,7 +53,7 @@ class EntryWatcherServiceTest : public testing::Test { base::FilePath::FromUTF8Unsafe("/x/y/z")); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { dispatch_event_log_targets_.clear(); dispatch_event_log_events_.clear(); } diff --git a/chrome/browser/extensions/api/file_system/file_system_api.cc b/chrome/browser/extensions/api/file_system/file_system_api.cc index 91e945a..a2b27a3c 100644 --- a/chrome/browser/extensions/api/file_system/file_system_api.cc +++ b/chrome/browser/extensions/api/file_system/file_system_api.cc @@ -431,7 +431,7 @@ class FileSystemChooseEntryFunction::FilePicker // ui::SelectFileDialog::Listener implementation. virtual void FileSelected(const base::FilePath& path, int index, - void* params) OVERRIDE { + void* params) override { std::vector<base::FilePath> paths; paths.push_back(path); MultiFilesSelected(paths, params); @@ -439,7 +439,7 @@ class FileSystemChooseEntryFunction::FilePicker virtual void FileSelectedWithExtraInfo(const ui::SelectedFileInfo& file, int index, - void* params) OVERRIDE { + void* params) override { // Normally, file.local_path is used because it is a native path to the // local read-only cached file in the case of remote file system like // Chrome OS's Google Drive integration. Here, however, |file.file_path| is @@ -452,14 +452,14 @@ class FileSystemChooseEntryFunction::FilePicker } virtual void MultiFilesSelected(const std::vector<base::FilePath>& files, - void* params) OVERRIDE { + void* params) override { function_->FilesSelected(files); delete this; } virtual void MultiFilesSelectedWithExtraInfo( const std::vector<ui::SelectedFileInfo>& files, - void* params) OVERRIDE { + void* params) override { std::vector<base::FilePath> paths; for (std::vector<ui::SelectedFileInfo>::const_iterator it = files.begin(); it != files.end(); ++it) { @@ -468,7 +468,7 @@ class FileSystemChooseEntryFunction::FilePicker MultiFilesSelected(paths, params); } - virtual void FileSelectionCanceled(void* params) OVERRIDE { + virtual void FileSelectionCanceled(void* params) override { function_->FileSelectionCanceled(); delete this; } 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 1d16abe..b2cb1ad 100644 --- a/chrome/browser/extensions/api/file_system/file_system_api.h +++ b/chrome/browser/extensions/api/file_system/file_system_api.h @@ -41,7 +41,7 @@ class FileSystemGetDisplayPathFunction : public ChromeSyncExtensionFunction { protected: virtual ~FileSystemGetDisplayPathFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class FileSystemEntryFunction : public ChromeAsyncExtensionFunction { @@ -89,7 +89,7 @@ class FileSystemGetWritableEntryFunction : public FileSystemEntryFunction { protected: virtual ~FileSystemGetWritableEntryFunction() {} - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void CheckPermissionAndSendResponse(); @@ -106,7 +106,7 @@ class FileSystemIsWritableEntryFunction : public ChromeSyncExtensionFunction { protected: virtual ~FileSystemIsWritableEntryFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class FileSystemChooseEntryFunction : public FileSystemEntryFunction { @@ -146,7 +146,7 @@ class FileSystemChooseEntryFunction : public FileSystemEntryFunction { class FilePicker; virtual ~FileSystemChooseEntryFunction() {} - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; void ShowPicker(const ui::SelectFileDialog::FileTypeInfo& file_type_info, ui::SelectFileDialog::Type picker_type); @@ -178,7 +178,7 @@ class FileSystemRetainEntryFunction : public ChromeAsyncExtensionFunction { protected: virtual ~FileSystemRetainEntryFunction() {} - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: // Retains the file entry referenced by |entry_id| in apps::SavedFilesService. @@ -200,7 +200,7 @@ class FileSystemIsRestorableFunction : public ChromeSyncExtensionFunction { protected: virtual ~FileSystemIsRestorableFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class FileSystemRestoreEntryFunction : public FileSystemEntryFunction { @@ -209,7 +209,7 @@ class FileSystemRestoreEntryFunction : public FileSystemEntryFunction { protected: virtual ~FileSystemRestoreEntryFunction() {} - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; }; class FileSystemObserveDirectoryFunction : public ChromeSyncExtensionFunction { @@ -219,7 +219,7 @@ class FileSystemObserveDirectoryFunction : public ChromeSyncExtensionFunction { protected: virtual ~FileSystemObserveDirectoryFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class FileSystemUnobserveEntryFunction : public ChromeSyncExtensionFunction { @@ -229,7 +229,7 @@ class FileSystemUnobserveEntryFunction : public ChromeSyncExtensionFunction { protected: virtual ~FileSystemUnobserveEntryFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class FileSystemGetObservedEntriesFunction @@ -240,7 +240,7 @@ class FileSystemGetObservedEntriesFunction protected: virtual ~FileSystemGetObservedEntriesFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/file_system/file_system_apitest.cc b/chrome/browser/extensions/api/file_system/file_system_apitest.cc index 312c9b3..91939f7 100644 --- a/chrome/browser/extensions/api/file_system/file_system_apitest.cc +++ b/chrome/browser/extensions/api/file_system/file_system_apitest.cc @@ -32,7 +32,7 @@ class AppLoadObserver : public ExtensionRegistryObserver { } virtual void OnExtensionLoaded(content::BrowserContext* browser_context, - const Extension* extension) OVERRIDE { + const Extension* extension) override { callback_.Run(extension); } @@ -64,7 +64,7 @@ const int kGraylistedPath = base::DIR_HOME; class FileSystemApiTest : public PlatformAppBrowserTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { PlatformAppBrowserTest::SetUpCommandLine(command_line); test_root_folder_ = test_data_dir_.AppendASCII("api_test") .AppendASCII("file_system"); @@ -72,11 +72,11 @@ class FileSystemApiTest : public PlatformAppBrowserTest { "test_root", test_root_folder_); } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { ClearCommandLineArgs(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { FileSystemChooseEntryFunction::StopSkippingPickerForTest(); PlatformAppBrowserTest::TearDown(); }; diff --git a/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc b/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc index 45c9d8d..7e7b970 100644 --- a/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc +++ b/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc @@ -28,7 +28,7 @@ class FileSystemApiTestForDrive : public PlatformAppBrowserTest { // Sets up fake Drive service for tests (this has to be injected before the // real DriveIntegrationService instance is created.) - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { PlatformAppBrowserTest::SetUpInProcessBrowserTestFixture(); extensions::ComponentLoader::EnableBackgroundExtensionsForTesting(); @@ -44,7 +44,7 @@ class FileSystemApiTestForDrive : public PlatformAppBrowserTest { // Ensure the fake service's data is fetch in the local file system. This is // necessary because the fetch starts lazily upon the first read operation. - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { PlatformAppBrowserTest::SetUpOnMainThread(); scoped_ptr<drive::ResourceEntry> entry; @@ -56,7 +56,7 @@ class FileSystemApiTestForDrive : public PlatformAppBrowserTest { ASSERT_EQ(drive::FILE_ERROR_OK, error); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { FileSystemChooseEntryFunction::StopSkippingPickerForTest(); PlatformAppBrowserTest::TearDown(); }; |