| Index: chrome/installer/util/chromium_binaries_distribution.h
|
| diff --git a/chrome/installer/util/chromium_binaries_distribution.h b/chrome/installer/util/chromium_binaries_distribution.h
|
| index 6c0066901fc8204fb77f668f4f12f107bb980046..5f19cb60bc46cec4df3900f2dbaa300f9171871a 100644
|
| --- a/chrome/installer/util/chromium_binaries_distribution.h
|
| +++ b/chrome/installer/util/chromium_binaries_distribution.h
|
| @@ -13,48 +13,48 @@
|
|
|
| class ChromiumBinariesDistribution : 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 GetDisplayName() OVERRIDE;
|
| + virtual base::string16 GetDisplayName() 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 GetBaseAppId() OVERRIDE;
|
| + virtual base::string16 GetBaseAppId() 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 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 DefaultBrowserControlPolicy GetDefaultBrowserControlPolicy() OVERRIDE;
|
|
|
| - virtual bool GetChromeChannel(string16* channel) OVERRIDE;
|
| + virtual bool GetChromeChannel(base::string16* channel) OVERRIDE;
|
|
|
| virtual bool GetCommandExecuteImplClsid(
|
| - string16* handler_class_uuid) OVERRIDE;
|
| + base::string16* handler_class_uuid) OVERRIDE;
|
|
|
| protected:
|
| friend class BrowserDistribution;
|
|
|