Index: chrome/browser/extensions/api/developer_private/developer_private_api.h |
diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.h b/chrome/browser/extensions/api/developer_private/developer_private_api.h |
index 9a6d08f9b5afa91c87225894c39d25473f7fac93..41bfff9b9fe670c7949d7d9914c90762f2222044 100644 |
--- a/chrome/browser/extensions/api/developer_private/developer_private_api.h |
+++ b/chrome/browser/extensions/api/developer_private/developer_private_api.h |
@@ -63,7 +63,7 @@ class DeveloperPrivateEventRouter : public content::NotificationObserver, |
public ErrorConsole::Observer { |
public: |
explicit DeveloperPrivateEventRouter(Profile* profile); |
- virtual ~DeveloperPrivateEventRouter(); |
+ ~DeveloperPrivateEventRouter() override; |
// Add or remove an ID to the list of extensions subscribed to events. |
void AddExtensionId(const std::string& extension_id); |
@@ -71,30 +71,27 @@ class DeveloperPrivateEventRouter : public content::NotificationObserver, |
private: |
// content::NotificationObserver implementation. |
- virtual void Observe(int type, |
- const content::NotificationSource& source, |
- const content::NotificationDetails& details) override; |
+ void Observe(int type, |
+ const content::NotificationSource& source, |
+ const content::NotificationDetails& details) override; |
// ExtensionRegistryObserver implementation. |
- virtual void OnExtensionLoaded(content::BrowserContext* browser_context, |
- const Extension* extension) override; |
- virtual void OnExtensionUnloaded( |
- content::BrowserContext* browser_context, |
- const Extension* extension, |
- UnloadedExtensionInfo::Reason reason) override; |
- virtual void OnExtensionWillBeInstalled( |
- content::BrowserContext* browser_context, |
- const Extension* extension, |
- bool is_update, |
- bool from_ephemeral, |
- const std::string& old_name) override; |
- virtual void OnExtensionUninstalled( |
- content::BrowserContext* browser_context, |
- const Extension* extension, |
- extensions::UninstallReason reason) override; |
+ void OnExtensionLoaded(content::BrowserContext* browser_context, |
+ const Extension* extension) override; |
+ void OnExtensionUnloaded(content::BrowserContext* browser_context, |
+ const Extension* extension, |
+ UnloadedExtensionInfo::Reason reason) override; |
+ void OnExtensionWillBeInstalled(content::BrowserContext* browser_context, |
+ const Extension* extension, |
+ bool is_update, |
+ bool from_ephemeral, |
+ const std::string& old_name) override; |
+ void OnExtensionUninstalled(content::BrowserContext* browser_context, |
+ const Extension* extension, |
+ extensions::UninstallReason reason) override; |
// ErrorConsole::Observer implementation. |
- virtual void OnErrorAdded(const ExtensionError* error) override; |
+ void OnErrorAdded(const ExtensionError* error) override; |
content::NotificationRegistrar registrar_; |
@@ -126,7 +123,7 @@ class DeveloperPrivateAPI : public BrowserContextKeyedAPI, |
static DeveloperPrivateAPI* Get(content::BrowserContext* context); |
explicit DeveloperPrivateAPI(content::BrowserContext* context); |
- virtual ~DeveloperPrivateAPI(); |
+ ~DeveloperPrivateAPI() override; |
void SetLastUnpackedDirectory(const base::FilePath& path); |
@@ -135,11 +132,11 @@ class DeveloperPrivateAPI : public BrowserContextKeyedAPI, |
} |
// KeyedService implementation |
- virtual void Shutdown() override; |
+ void Shutdown() override; |
// EventRouter::Observer implementation. |
- virtual void OnListenerAdded(const EventListenerInfo& details) override; |
- virtual void OnListenerRemoved(const EventListenerInfo& details) override; |
+ void OnListenerAdded(const EventListenerInfo& details) override; |
+ void OnListenerRemoved(const EventListenerInfo& details) override; |
private: |
friend class BrowserContextKeyedAPIFactory<DeveloperPrivateAPI>; |
@@ -171,10 +168,10 @@ class DeveloperPrivateAutoUpdateFunction : public ChromeSyncExtensionFunction { |
DEVELOPERPRIVATE_AUTOUPDATE) |
protected: |
- virtual ~DeveloperPrivateAutoUpdateFunction(); |
+ ~DeveloperPrivateAutoUpdateFunction() override; |
// ExtensionFunction: |
- virtual bool RunSync() override; |
+ bool RunSync() override; |
}; |
class DeveloperPrivateGetItemsInfoFunction |
@@ -184,10 +181,10 @@ class DeveloperPrivateGetItemsInfoFunction |
DEVELOPERPRIVATE_GETITEMSINFO) |
protected: |
- virtual ~DeveloperPrivateGetItemsInfoFunction(); |
+ ~DeveloperPrivateGetItemsInfoFunction() override; |
// ExtensionFunction: |
- virtual bool RunAsync() override; |
+ bool RunAsync() override; |
private: |
scoped_ptr<developer::ItemInfo> CreateItemInfo(const Extension& item, |
@@ -224,10 +221,10 @@ class DeveloperPrivateInspectFunction : public ChromeSyncExtensionFunction { |
DEVELOPERPRIVATE_INSPECT) |
protected: |
- virtual ~DeveloperPrivateInspectFunction(); |
+ ~DeveloperPrivateInspectFunction() override; |
// ExtensionFunction: |
- virtual bool RunSync() override; |
+ bool RunSync() override; |
}; |
class DeveloperPrivateAllowFileAccessFunction |
@@ -237,10 +234,10 @@ class DeveloperPrivateAllowFileAccessFunction |
DEVELOPERPRIVATE_ALLOWFILEACCESS); |
protected: |
- virtual ~DeveloperPrivateAllowFileAccessFunction(); |
+ ~DeveloperPrivateAllowFileAccessFunction() override; |
// ExtensionFunction: |
- virtual bool RunSync() override; |
+ bool RunSync() override; |
}; |
class DeveloperPrivateAllowIncognitoFunction |
@@ -250,10 +247,10 @@ class DeveloperPrivateAllowIncognitoFunction |
DEVELOPERPRIVATE_ALLOWINCOGNITO); |
protected: |
- virtual ~DeveloperPrivateAllowIncognitoFunction(); |
+ ~DeveloperPrivateAllowIncognitoFunction() override; |
// ExtensionFunction: |
- virtual bool RunSync() override; |
+ bool RunSync() override; |
}; |
class DeveloperPrivateReloadFunction : public ChromeSyncExtensionFunction { |
@@ -262,10 +259,10 @@ class DeveloperPrivateReloadFunction : public ChromeSyncExtensionFunction { |
DEVELOPERPRIVATE_RELOAD); |
protected: |
- virtual ~DeveloperPrivateReloadFunction(); |
+ ~DeveloperPrivateReloadFunction() override; |
// ExtensionFunction: |
- virtual bool RunSync() override; |
+ bool RunSync() override; |
}; |
class DeveloperPrivateShowPermissionsDialogFunction |
@@ -277,14 +274,14 @@ class DeveloperPrivateShowPermissionsDialogFunction |
DeveloperPrivateShowPermissionsDialogFunction(); |
protected: |
- virtual ~DeveloperPrivateShowPermissionsDialogFunction(); |
+ ~DeveloperPrivateShowPermissionsDialogFunction() override; |
// ExtensionFunction: |
- virtual bool RunSync() override; |
+ bool RunSync() override; |
// Overridden from ExtensionInstallPrompt::Delegate |
- virtual void InstallUIProceed() override; |
- virtual void InstallUIAbort(bool user_initiated) override; |
+ void InstallUIProceed() override; |
+ void InstallUIAbort(bool user_initiated) override; |
scoped_ptr<ExtensionInstallPrompt> prompt_; |
std::string extension_id_; |
@@ -300,13 +297,13 @@ class DeveloperPrivateEnableFunction |
DeveloperPrivateEnableFunction(); |
protected: |
- virtual ~DeveloperPrivateEnableFunction(); |
+ ~DeveloperPrivateEnableFunction() override; |
// Callback for requirements checker. |
void OnRequirementsChecked(const std::string& extension_id, |
std::vector<std::string> requirements_errors); |
// ExtensionFunction: |
- virtual bool RunSync() override; |
+ bool RunSync() override; |
private: |
scoped_ptr<RequirementsChecker> requirements_checker_; |
@@ -315,8 +312,8 @@ class DeveloperPrivateEnableFunction |
class DeveloperPrivateChooseEntryFunction : public ChromeAsyncExtensionFunction, |
public EntryPickerClient { |
protected: |
- virtual ~DeveloperPrivateChooseEntryFunction(); |
- virtual bool RunAsync() override; |
+ ~DeveloperPrivateChooseEntryFunction() override; |
+ bool RunAsync() override; |
bool ShowPicker(ui::SelectFileDialog::Type picker_type, |
const base::FilePath& last_directory, |
const base::string16& select_title, |
@@ -336,12 +333,12 @@ class DeveloperPrivateLoadUnpackedFunction |
DEVELOPERPRIVATE_LOADUNPACKED); |
protected: |
- virtual ~DeveloperPrivateLoadUnpackedFunction(); |
- virtual bool RunAsync() override; |
+ ~DeveloperPrivateLoadUnpackedFunction() override; |
+ bool RunAsync() override; |
// EntryPickerCLient implementation. |
- virtual void FileSelected(const base::FilePath& path) override; |
- virtual void FileSelectionCanceled() override; |
+ void FileSelected(const base::FilePath& path) override; |
+ void FileSelectionCanceled() override; |
}; |
class DeveloperPrivateChoosePathFunction |
@@ -351,12 +348,12 @@ class DeveloperPrivateChoosePathFunction |
DEVELOPERPRIVATE_CHOOSEPATH); |
protected: |
- virtual ~DeveloperPrivateChoosePathFunction(); |
- virtual bool RunAsync() override; |
+ ~DeveloperPrivateChoosePathFunction() override; |
+ bool RunAsync() override; |
// EntryPickerClient functions. |
- virtual void FileSelected(const base::FilePath& path) override; |
- virtual void FileSelectionCanceled() override; |
+ void FileSelected(const base::FilePath& path) override; |
+ void FileSelectionCanceled() override; |
}; |
class DeveloperPrivatePackDirectoryFunction |
@@ -370,14 +367,14 @@ class DeveloperPrivatePackDirectoryFunction |
DeveloperPrivatePackDirectoryFunction(); |
// ExtensionPackJob::Client implementation. |
- virtual void OnPackSuccess(const base::FilePath& crx_file, |
- const base::FilePath& key_file) override; |
- virtual void OnPackFailure(const std::string& error, |
- ExtensionCreator::ErrorType error_type) override; |
+ void OnPackSuccess(const base::FilePath& crx_file, |
+ const base::FilePath& key_file) override; |
+ void OnPackFailure(const std::string& error, |
+ ExtensionCreator::ErrorType error_type) override; |
protected: |
- virtual ~DeveloperPrivatePackDirectoryFunction(); |
- virtual bool RunAsync() override; |
+ ~DeveloperPrivatePackDirectoryFunction() override; |
+ bool RunAsync() override; |
private: |
scoped_refptr<PackExtensionJob> pack_job_; |
@@ -392,10 +389,10 @@ class DeveloperPrivateIsProfileManagedFunction |
DEVELOPERPRIVATE_ISPROFILEMANAGED); |
protected: |
- virtual ~DeveloperPrivateIsProfileManagedFunction(); |
+ ~DeveloperPrivateIsProfileManagedFunction() override; |
// ExtensionFunction: |
- virtual bool RunSync() override; |
+ bool RunSync() override; |
}; |
class DeveloperPrivateLoadDirectoryFunction |
@@ -407,10 +404,10 @@ class DeveloperPrivateLoadDirectoryFunction |
DeveloperPrivateLoadDirectoryFunction(); |
protected: |
- virtual ~DeveloperPrivateLoadDirectoryFunction(); |
+ ~DeveloperPrivateLoadDirectoryFunction() override; |
// ExtensionFunction: |
- virtual bool RunAsync() override; |
+ bool RunAsync() override; |
bool LoadByFileSystemAPI(const storage::FileSystemURL& directory_url); |
@@ -463,10 +460,10 @@ class DeveloperPrivateRequestFileSourceFunction |
DeveloperPrivateRequestFileSourceFunction(); |
protected: |
- virtual ~DeveloperPrivateRequestFileSourceFunction(); |
+ ~DeveloperPrivateRequestFileSourceFunction() override; |
// ExtensionFunction: |
- virtual bool RunAsync() override; |
+ bool RunAsync() override; |
private: |
void LaunchCallback(const base::DictionaryValue& results); |
@@ -481,10 +478,10 @@ class DeveloperPrivateOpenDevToolsFunction |
DeveloperPrivateOpenDevToolsFunction(); |
protected: |
- virtual ~DeveloperPrivateOpenDevToolsFunction(); |
+ ~DeveloperPrivateOpenDevToolsFunction() override; |
// ExtensionFunction: |
- virtual bool RunAsync() override; |
+ bool RunAsync() override; |
}; |
} // namespace api |