Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(109)

Side by Side Diff: chrome/installer/util/chrome_frame_operations.h

Issue 627423002: Replacing the OVERRIDE with override in chrome/installer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Patch is rebased Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_INSTALLER_UTIL_CHROME_FRAME_OPERATIONS_H_ 5 #ifndef CHROME_INSTALLER_UTIL_CHROME_FRAME_OPERATIONS_H_
6 #define CHROME_INSTALLER_UTIL_CHROME_FRAME_OPERATIONS_H_ 6 #define CHROME_INSTALLER_UTIL_CHROME_FRAME_OPERATIONS_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "chrome/installer/util/product_operations.h" 10 #include "chrome/installer/util/product_operations.h"
11 11
12 namespace installer { 12 namespace installer {
13 13
14 // Operations specific to Chrome Frame; see ProductOperations for general info. 14 // Operations specific to Chrome Frame; see ProductOperations for general info.
15 class ChromeFrameOperations : public ProductOperations { 15 class ChromeFrameOperations : public ProductOperations {
16 public: 16 public:
17 ChromeFrameOperations() {} 17 ChromeFrameOperations() {}
18 18
19 virtual void ReadOptions(const MasterPreferences& prefs, 19 virtual void ReadOptions(const MasterPreferences& prefs,
20 std::set<base::string16>* options) const OVERRIDE; 20 std::set<base::string16>* options) const override;
21 21
22 virtual void ReadOptions(const base::CommandLine& uninstall_command, 22 virtual void ReadOptions(const base::CommandLine& uninstall_command,
23 std::set<base::string16>* options) const OVERRIDE; 23 std::set<base::string16>* options) const override;
24 24
25 virtual void AddKeyFiles( 25 virtual void AddKeyFiles(
26 const std::set<base::string16>& options, 26 const std::set<base::string16>& options,
27 std::vector<base::FilePath>* key_files) const OVERRIDE; 27 std::vector<base::FilePath>* key_files) const override;
28 28
29 virtual void AddComDllList( 29 virtual void AddComDllList(
30 const std::set<base::string16>& options, 30 const std::set<base::string16>& options,
31 std::vector<base::FilePath>* com_dll_list) const OVERRIDE; 31 std::vector<base::FilePath>* com_dll_list) const override;
32 32
33 virtual void AppendProductFlags(const std::set<base::string16>& options, 33 virtual void AppendProductFlags(const std::set<base::string16>& options,
34 base::CommandLine* cmd_line) const OVERRIDE; 34 base::CommandLine* cmd_line) const override;
35 35
36 virtual void AppendRenameFlags(const std::set<base::string16>& options, 36 virtual void AppendRenameFlags(const std::set<base::string16>& options,
37 base::CommandLine* cmd_line) const OVERRIDE; 37 base::CommandLine* cmd_line) const override;
38 38
39 virtual bool SetChannelFlags(const std::set<base::string16>& options, 39 virtual bool SetChannelFlags(const std::set<base::string16>& options,
40 bool set, 40 bool set,
41 ChannelInfo* channel_info) const OVERRIDE; 41 ChannelInfo* channel_info) const override;
42 42
43 virtual bool ShouldCreateUninstallEntry( 43 virtual bool ShouldCreateUninstallEntry(
44 const std::set<base::string16>& options) const OVERRIDE; 44 const std::set<base::string16>& options) const override;
45 45
46 virtual void AddDefaultShortcutProperties( 46 virtual void AddDefaultShortcutProperties(
47 BrowserDistribution* dist, 47 BrowserDistribution* dist,
48 const base::FilePath& target_exe, 48 const base::FilePath& target_exe,
49 ShellUtil::ShortcutProperties* properties) const OVERRIDE; 49 ShellUtil::ShortcutProperties* properties) const override;
50 50
51 virtual void LaunchUserExperiment(const base::FilePath& setup_path, 51 virtual void LaunchUserExperiment(const base::FilePath& setup_path,
52 const std::set<base::string16>& options, 52 const std::set<base::string16>& options,
53 InstallStatus status, 53 InstallStatus status,
54 bool system_level) const OVERRIDE; 54 bool system_level) const override;
55 55
56 private: 56 private:
57 DISALLOW_COPY_AND_ASSIGN(ChromeFrameOperations); 57 DISALLOW_COPY_AND_ASSIGN(ChromeFrameOperations);
58 }; 58 };
59 59
60 } // namespace installer 60 } // namespace installer
61 61
62 #endif // CHROME_INSTALLER_UTIL_CHROME_FRAME_OPERATIONS_H_ 62 #endif // CHROME_INSTALLER_UTIL_CHROME_FRAME_OPERATIONS_H_
OLDNEW
« no previous file with comments | « chrome/installer/util/chrome_frame_distribution.h ('k') | chrome/installer/util/chromium_binaries_distribution.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698