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

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

Issue 10246007: Fix GetAppShortcutName to return a localized name for Chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: string16 madness Created 8 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 | Annotate | Revision Log
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 #pragma once 7 #pragma once
8 8
9 #include "base/string16.h"
9 #include "chrome/installer/util/browser_distribution.h" 10 #include "chrome/installer/util/browser_distribution.h"
10 #include "chrome/installer/util/google_chrome_distribution.h" 11 #include "chrome/installer/util/google_chrome_distribution.h"
11 #include "chrome/installer/util/l10n_string_util.h" 12 #include "chrome/installer/util/l10n_string_util.h"
12 #include "chrome/installer/util/util_constants.h" 13 #include "chrome/installer/util/util_constants.h"
13 14
14 // GoogleChromeSxSDistribution encapsulates properties of Google Chrome Sxs 15 // GoogleChromeSxSDistribution encapsulates properties of Google Chrome Sxs
15 // distribution which can co-exist with other Google Chrome distributions. 16 // distribution which can co-exist with other Google Chrome distributions.
16 // Google Chrome Sxs distribution is installed to a different path, runs 17 // Google Chrome Sxs distribution is installed to a different path, runs
17 // alongside with normally installed Google Chrome, and is updated separately. 18 // alongside with normally installed Google Chrome, and is updated separately.
18 // It is mainly used for developer preview and testing, and is disabled for 19 // It is mainly used for developer preview and testing, and is disabled for
19 // system level install and setting as default browser. 20 // system level install and setting as default browser.
20 class GoogleChromeSxSDistribution : public GoogleChromeDistribution { 21 class GoogleChromeSxSDistribution : public GoogleChromeDistribution {
21 public: 22 public:
22 virtual std::wstring GetApplicationName() OVERRIDE; 23 virtual string16 GetApplicationName() OVERRIDE;
23 virtual std::wstring GetAppShortCutName() OVERRIDE; 24 virtual string16 GetAppShortCutName() OVERRIDE;
24 virtual std::wstring GetBrowserAppId() OVERRIDE; 25 virtual string16 GetBrowserAppId() OVERRIDE;
25 virtual std::wstring GetInstallSubDir() OVERRIDE; 26 virtual string16 GetInstallSubDir() OVERRIDE;
26 virtual std::wstring GetUninstallRegPath() OVERRIDE; 27 virtual string16 GetUninstallRegPath() OVERRIDE;
27 virtual bool CanSetAsDefault() OVERRIDE; 28 virtual bool CanSetAsDefault() OVERRIDE;
28 virtual int GetIconIndex() OVERRIDE; 29 virtual int GetIconIndex() OVERRIDE;
29 virtual bool GetChromeChannel(std::wstring* channel) OVERRIDE; 30 virtual bool GetChromeChannel(string16* channel) OVERRIDE;
30 virtual bool GetDelegateExecuteHandlerData(string16* handler_class_uuid, 31 virtual bool GetDelegateExecuteHandlerData(string16* handler_class_uuid,
31 string16* type_lib_uuid, 32 string16* type_lib_uuid,
32 string16* type_lib_version, 33 string16* type_lib_version,
33 string16* interface_uuid) OVERRIDE; 34 string16* interface_uuid) OVERRIDE;
34 // returns the channel name for GoogleChromeSxSDistribution 35 // returns the channel name for GoogleChromeSxSDistribution
35 static std::wstring ChannelName(); 36 static string16 ChannelName();
36 private: 37 private:
37 friend class BrowserDistribution; 38 friend class BrowserDistribution;
38 39
39 // Disallow construction from non-friends. 40 // Disallow construction from non-friends.
40 GoogleChromeSxSDistribution(); 41 GoogleChromeSxSDistribution();
41 }; 42 };
42 43
43 #endif // CHROME_INSTALLER_UTIL_GOOGLE_CHROME_SXS_DISTRIBUTION_H_ 44 #endif // CHROME_INSTALLER_UTIL_GOOGLE_CHROME_SXS_DISTRIBUTION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698