| 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 0a69bd1dc11a63e4b5a6d610162b03645548bb51..158b2b243392755f7910c60dc586dc880ecad8ad 100644
|
| --- a/chrome/installer/util/chrome_frame_distribution.h
|
| +++ b/chrome/installer/util/chrome_frame_distribution.h
|
| @@ -13,50 +13,50 @@
|
|
|
| class ChromeFrameDistribution : public BrowserDistribution {
|
| public:
|
| - virtual string16 GetAppGuid() OVERRIDE;
|
| + virtual base::string16 GetAppGuid() OVERRIDE;
|
|
|
| - virtual string16 GetBrowserProgIdPrefix() OVERRIDE;
|
| + virtual base::string16 GetBrowserProgIdPrefix() OVERRIDE;
|
|
|
| - virtual string16 GetBrowserProgIdDesc() OVERRIDE;
|
| + virtual base::string16 GetBrowserProgIdDesc() OVERRIDE;
|
|
|
| - virtual string16 GetShortcutName(ShortcutType shortcut_type) OVERRIDE;
|
| + virtual base::string16 GetShortcutName(ShortcutType shortcut_type) OVERRIDE;
|
|
|
| virtual int GetIconIndex(ShortcutType shortcut_type) OVERRIDE;
|
|
|
| - virtual string16 GetBaseAppName() OVERRIDE;
|
| + virtual base::string16 GetBaseAppName() OVERRIDE;
|
|
|
| - virtual string16 GetInstallSubDir() OVERRIDE;
|
| + virtual base::string16 GetInstallSubDir() OVERRIDE;
|
|
|
| - virtual string16 GetPublisherName() OVERRIDE;
|
| + virtual base::string16 GetPublisherName() OVERRIDE;
|
|
|
| - virtual string16 GetAppDescription() OVERRIDE;
|
| + virtual base::string16 GetAppDescription() OVERRIDE;
|
|
|
| - virtual string16 GetLongAppDescription() OVERRIDE;
|
| + virtual base::string16 GetLongAppDescription() OVERRIDE;
|
|
|
| virtual std::string GetSafeBrowsingName() OVERRIDE;
|
|
|
| - virtual string16 GetStateKey() OVERRIDE;
|
| + virtual base::string16 GetStateKey() OVERRIDE;
|
|
|
| - virtual string16 GetStateMediumKey() OVERRIDE;
|
| + virtual base::string16 GetStateMediumKey() OVERRIDE;
|
|
|
| virtual std::string GetNetworkStatsServer() const OVERRIDE;
|
|
|
| virtual std::string GetHttpPipeliningTestServer() const OVERRIDE;
|
|
|
| - virtual string16 GetUninstallLinkName() OVERRIDE;
|
| + virtual base::string16 GetUninstallLinkName() OVERRIDE;
|
|
|
| - virtual string16 GetUninstallRegPath() OVERRIDE;
|
| + virtual base::string16 GetUninstallRegPath() OVERRIDE;
|
|
|
| - virtual string16 GetVersionKey() OVERRIDE;
|
| + virtual base::string16 GetVersionKey() OVERRIDE;
|
|
|
| - virtual string16 GetIconFilename() OVERRIDE;
|
| + virtual base::string16 GetIconFilename() OVERRIDE;
|
|
|
| virtual DefaultBrowserControlPolicy GetDefaultBrowserControlPolicy() OVERRIDE;
|
|
|
| virtual bool CanCreateDesktopShortcuts() OVERRIDE;
|
|
|
| virtual bool GetCommandExecuteImplClsid(
|
| - string16* handler_class_uuid) OVERRIDE;
|
| + base::string16* handler_class_uuid) OVERRIDE;
|
|
|
| virtual void UpdateInstallStatus(bool system_install,
|
| installer::ArchiveType archive_type,
|
|
|