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

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

Issue 1100223002: Update {virtual,override} to follow C++11 style in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 7 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_GOOGLE_CHROME_SXS_DISTRIBUTION_H_ 5 #ifndef CHROME_INSTALLER_UTIL_GOOGLE_CHROME_SXS_DISTRIBUTION_H_
6 #define CHROME_INSTALLER_UTIL_GOOGLE_CHROME_SXS_DISTRIBUTION_H_ 6 #define CHROME_INSTALLER_UTIL_GOOGLE_CHROME_SXS_DISTRIBUTION_H_
7 7
8 #include "base/strings/string16.h" 8 #include "base/strings/string16.h"
9 #include "chrome/installer/util/browser_distribution.h" 9 #include "chrome/installer/util/browser_distribution.h"
10 #include "chrome/installer/util/google_chrome_distribution.h" 10 #include "chrome/installer/util/google_chrome_distribution.h"
11 #include "chrome/installer/util/l10n_string_util.h" 11 #include "chrome/installer/util/l10n_string_util.h"
12 #include "chrome/installer/util/util_constants.h" 12 #include "chrome/installer/util/util_constants.h"
13 13
14 // GoogleChromeSxSDistribution encapsulates properties of Google Chrome Sxs 14 // GoogleChromeSxSDistribution encapsulates properties of Google Chrome Sxs
15 // distribution which can co-exist with other Google Chrome distributions. 15 // distribution which can co-exist with other Google Chrome distributions.
16 // Google Chrome Sxs distribution is installed to a different path, runs 16 // Google Chrome Sxs distribution is installed to a different path, runs
17 // alongside with normally installed Google Chrome, and is updated separately. 17 // alongside with normally installed Google Chrome, and is updated separately.
18 // It is mainly used for developer preview and testing, and is disabled for 18 // It is mainly used for developer preview and testing, and is disabled for
19 // system level install and setting as default browser. 19 // system level install and setting as default browser.
20 class GoogleChromeSxSDistribution : public GoogleChromeDistribution { 20 class GoogleChromeSxSDistribution : public GoogleChromeDistribution {
21 public: 21 public:
22 virtual base::string16 GetBaseAppName() override; 22 base::string16 GetBaseAppName() override;
23 virtual base::string16 GetShortcutName(ShortcutType shortcut_type) override; 23 base::string16 GetShortcutName(ShortcutType shortcut_type) override;
24 virtual int GetIconIndex(ShortcutType shortcut_type) override; 24 int GetIconIndex(ShortcutType shortcut_type) override;
25 virtual base::string16 GetStartMenuShortcutSubfolder( 25 base::string16 GetStartMenuShortcutSubfolder(
26 Subfolder subfolder_type) override; 26 Subfolder subfolder_type) override;
27 virtual base::string16 GetBaseAppId() override; 27 base::string16 GetBaseAppId() override;
28 virtual base::string16 GetBrowserProgIdPrefix() override; 28 base::string16 GetBrowserProgIdPrefix() override;
29 virtual base::string16 GetBrowserProgIdDesc() override; 29 base::string16 GetBrowserProgIdDesc() override;
30 virtual base::string16 GetInstallSubDir() override; 30 base::string16 GetInstallSubDir() override;
31 virtual base::string16 GetUninstallRegPath() override; 31 base::string16 GetUninstallRegPath() override;
32 virtual DefaultBrowserControlPolicy GetDefaultBrowserControlPolicy() override; 32 DefaultBrowserControlPolicy GetDefaultBrowserControlPolicy() override;
33 virtual bool GetChromeChannel(base::string16* channel) override; 33 bool GetChromeChannel(base::string16* channel) override;
34 virtual bool GetCommandExecuteImplClsid( 34 bool GetCommandExecuteImplClsid(base::string16* handler_class_uuid) override;
35 base::string16* handler_class_uuid) override; 35 bool ShouldSetExperimentLabels() override;
36 virtual bool ShouldSetExperimentLabels() override; 36 bool HasUserExperiments() override;
37 virtual bool HasUserExperiments() override;
38 // returns the channel name for GoogleChromeSxSDistribution 37 // returns the channel name for GoogleChromeSxSDistribution
39 static base::string16 ChannelName(); 38 static base::string16 ChannelName();
40 private: 39 private:
41 friend class BrowserDistribution; 40 friend class BrowserDistribution;
42 41
43 // Disallow construction from non-friends. 42 // Disallow construction from non-friends.
44 GoogleChromeSxSDistribution(); 43 GoogleChromeSxSDistribution();
45 }; 44 };
46 45
47 #endif // CHROME_INSTALLER_UTIL_GOOGLE_CHROME_SXS_DISTRIBUTION_H_ 46 #endif // CHROME_INSTALLER_UTIL_GOOGLE_CHROME_SXS_DISTRIBUTION_H_
OLDNEW
« no previous file with comments | « chrome/installer/util/google_chrome_distribution.h ('k') | chrome/installer/util/google_update_settings_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698