summaryrefslogtreecommitdiffstats
path: root/chrome/installer/util/chrome_browser_operations.h
diff options
context:
space:
mode:
authornick <nick@chromium.org>2015-04-24 13:45:38 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-24 20:45:43 +0000
commitddb02ac66bad95bc04548a799eb2ce89a456b37c (patch)
tree948622946e37611fa5198b4dba00ad31ec15c7ec /chrome/installer/util/chrome_browser_operations.h
parentd9456757bec482f2b27cf75ef7fa2109af0500a6 (diff)
downloadchromium_src-ddb02ac66bad95bc04548a799eb2ce89a456b37c.zip
chromium_src-ddb02ac66bad95bc04548a799eb2ce89a456b37c.tar.gz
chromium_src-ddb02ac66bad95bc04548a799eb2ce89a456b37c.tar.bz2
Update {virtual,override} to follow C++11 style in chrome.
The Google style guide states that only one of {virtual,override,final} should be used for each declaration, since override implies virtual and final implies both virtual and override. This patch was manually generated using a regex and a text editor. BUG=417463 Review URL: https://codereview.chromium.org/1100223002 Cr-Commit-Position: refs/heads/master@{#326870}
Diffstat (limited to 'chrome/installer/util/chrome_browser_operations.h')
-rw-r--r--chrome/installer/util/chrome_browser_operations.h44
1 files changed, 21 insertions, 23 deletions
diff --git a/chrome/installer/util/chrome_browser_operations.h b/chrome/installer/util/chrome_browser_operations.h
index eb695c7..fe17c91 100644
--- a/chrome/installer/util/chrome_browser_operations.h
+++ b/chrome/installer/util/chrome_browser_operations.h
@@ -16,42 +16,40 @@ class ChromeBrowserOperations : public ProductOperations {
public:
ChromeBrowserOperations() {}
- virtual void ReadOptions(const MasterPreferences& prefs,
- std::set<base::string16>* options) const override;
+ void ReadOptions(const MasterPreferences& prefs,
+ std::set<base::string16>* options) const override;
- virtual void ReadOptions(const base::CommandLine& uninstall_command,
- std::set<base::string16>* options) const override;
+ void ReadOptions(const base::CommandLine& uninstall_command,
+ std::set<base::string16>* options) const override;
- virtual void AddKeyFiles(
- const std::set<base::string16>& options,
- std::vector<base::FilePath>* key_files) const override;
+ void AddKeyFiles(const std::set<base::string16>& options,
+ std::vector<base::FilePath>* key_files) const override;
- virtual void AddComDllList(
- const std::set<base::string16>& options,
- std::vector<base::FilePath>* com_dll_list) const override;
+ void AddComDllList(const std::set<base::string16>& options,
+ std::vector<base::FilePath>* com_dll_list) const override;
- virtual void AppendProductFlags(const std::set<base::string16>& options,
- base::CommandLine* cmd_line) const override;
+ void AppendProductFlags(const std::set<base::string16>& options,
+ base::CommandLine* cmd_line) const override;
- virtual void AppendRenameFlags(const std::set<base::string16>& options,
- base::CommandLine* cmd_line) const override;
+ void AppendRenameFlags(const std::set<base::string16>& options,
+ base::CommandLine* cmd_line) const override;
- virtual bool SetChannelFlags(const std::set<base::string16>& options,
- bool set,
- ChannelInfo* channel_info) const override;
+ bool SetChannelFlags(const std::set<base::string16>& options,
+ bool set,
+ ChannelInfo* channel_info) const override;
- virtual bool ShouldCreateUninstallEntry(
+ bool ShouldCreateUninstallEntry(
const std::set<base::string16>& options) const override;
- virtual void AddDefaultShortcutProperties(
+ void AddDefaultShortcutProperties(
BrowserDistribution* dist,
const base::FilePath& target_exe,
ShellUtil::ShortcutProperties* properties) const override;
- virtual void LaunchUserExperiment(const base::FilePath& setup_path,
- const std::set<base::string16>& options,
- InstallStatus status,
- bool system_level) const override;
+ void LaunchUserExperiment(const base::FilePath& setup_path,
+ const std::set<base::string16>& options,
+ InstallStatus status,
+ bool system_level) const override;
private:
DISALLOW_COPY_AND_ASSIGN(ChromeBrowserOperations);