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

Unified Diff: chrome/installer/util/chrome_frame_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, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/installer/util/chrome_frame_distribution.h
diff --git a/chrome/installer/util/chrome_frame_distribution.h b/chrome/installer/util/chrome_frame_distribution.h
index d7b1275528c19f5f86031dbb68e261aee07c1029..cfec37f5cbcc6ea612a7b2cab73826e8f6432b8c 100644
--- a/chrome/installer/util/chrome_frame_distribution.h
+++ b/chrome/installer/util/chrome_frame_distribution.h
@@ -12,53 +12,54 @@
#include <string>
grt (UTC plus 2) 2012/04/27 18:23:07 remove this since the only uses of std::string are
gab 2012/04/27 20:58:45 Done.
#include <vector>
grt (UTC plus 2) 2012/04/27 18:23:07 this seems stale. please remove while you're here
gab 2012/04/27 20:58:45 Done.
+#include "base/string16.h"
grt (UTC plus 2) 2012/04/27 18:23:07 remove this for same reason as <string>
gab 2012/04/27 20:58:45 Done.
#include "chrome/installer/util/browser_distribution.h"
#include "chrome/installer/util/util_constants.h"
class ChromeFrameDistribution : public BrowserDistribution {
public:
- virtual std::wstring GetAppGuid() OVERRIDE;
+ virtual string16 GetAppGuid() OVERRIDE;
- virtual std::wstring GetApplicationName() OVERRIDE;
+ virtual string16 GetApplicationName() OVERRIDE;
- virtual std::wstring GetAppShortCutName() OVERRIDE;
+ virtual string16 GetAppShortCutName() OVERRIDE;
- virtual std::wstring GetAlternateApplicationName() OVERRIDE;
+ virtual string16 GetAlternateApplicationName() OVERRIDE;
- virtual std::wstring GetInstallSubDir() OVERRIDE;
+ virtual string16 GetInstallSubDir() OVERRIDE;
- virtual std::wstring GetPublisherName() OVERRIDE;
+ virtual string16 GetPublisherName() OVERRIDE;
- virtual std::wstring GetAppDescription() OVERRIDE;
+ virtual string16 GetAppDescription() OVERRIDE;
- virtual std::wstring GetLongAppDescription() OVERRIDE;
+ virtual string16 GetLongAppDescription() OVERRIDE;
virtual std::string GetSafeBrowsingName() OVERRIDE;
- virtual std::wstring GetStateKey() OVERRIDE;
+ virtual string16 GetStateKey() OVERRIDE;
- virtual std::wstring GetStateMediumKey() OVERRIDE;
+ virtual string16 GetStateMediumKey() OVERRIDE;
- virtual std::wstring GetStatsServerURL() OVERRIDE;
+ virtual string16 GetStatsServerURL() OVERRIDE;
virtual std::string GetNetworkStatsServer() const OVERRIDE;
virtual std::string GetHttpPipeliningTestServer() const OVERRIDE;
- virtual std::wstring GetUninstallLinkName() OVERRIDE;
+ virtual string16 GetUninstallLinkName() OVERRIDE;
- virtual std::wstring GetUninstallRegPath() OVERRIDE;
+ virtual string16 GetUninstallRegPath() OVERRIDE;
- virtual std::wstring GetVersionKey() OVERRIDE;
+ virtual string16 GetVersionKey() OVERRIDE;
virtual bool CanSetAsDefault() OVERRIDE;
virtual bool CanCreateDesktopShortcuts() OVERRIDE;
virtual bool GetDelegateExecuteHandlerData(string16* handler_class_uuid,
- string16* type_lib_uuid,
- string16* type_lib_version,
- string16* interface_uuid) OVERRIDE;
+ string16* type_lib_uuid,
+ string16* type_lib_version,
+ string16* interface_uuid) OVERRIDE;
virtual void UpdateInstallStatus(bool system_install,
installer::ArchiveType archive_type,

Powered by Google App Engine
This is Rietveld 408576698