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

Unified Diff: chrome/installer/util/google_chrome_sxs_distribution.h

Issue 23258005: Give SxS distribution its own registration GUIDs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove magic key combo from browser_options_handler.cc Created 7 years, 3 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/google_chrome_sxs_distribution.h
diff --git a/chrome/installer/util/google_chrome_sxs_distribution.h b/chrome/installer/util/google_chrome_sxs_distribution.h
index 5261a7accdd044708b9b8d8220c51b1f7cf92b55..00ecd5bfcee0256eb2bb4f1e0deb798e5e180e25 100644
--- a/chrome/installer/util/google_chrome_sxs_distribution.h
+++ b/chrome/installer/util/google_chrome_sxs_distribution.h
@@ -23,12 +23,18 @@ class GoogleChromeSxSDistribution : public GoogleChromeDistribution {
virtual string16 GetShortcutName(ShortcutType shortcut_type) OVERRIDE;
virtual int GetIconIndex(ShortcutType shortcut_type) OVERRIDE;
virtual string16 GetBaseAppId() OVERRIDE;
+ virtual string16 GetBrowserProgIdPrefix() OVERRIDE;
+ virtual string16 GetBrowserProgIdDesc() OVERRIDE;
virtual string16 GetInstallSubDir() OVERRIDE;
virtual string16 GetUninstallRegPath() OVERRIDE;
virtual bool CanSetAsDefault() OVERRIDE;
+ virtual void DebugEnableSetAsDefault() OVERRIDE;
virtual bool GetChromeChannel(string16* channel) OVERRIDE;
- virtual bool GetCommandExecuteImplClsid(
+ virtual bool GetCommandExecuteImplClsidString(
string16* handler_class_uuid) OVERRIDE;
+#if defined(OS_WIN)
+ virtual bool GetCommandExecuteImplClsid(CLSID* handler_class_uuid) OVERRIDE;
+#endif
virtual bool AppHostIsSupported() OVERRIDE;
virtual bool ShouldSetExperimentLabels() OVERRIDE;
virtual bool HasUserExperiments() OVERRIDE;
@@ -39,6 +45,8 @@ class GoogleChromeSxSDistribution : public GoogleChromeDistribution {
// Disallow construction from non-friends.
GoogleChromeSxSDistribution();
+
+ bool enable_set_as_default_;
};
#endif // CHROME_INSTALLER_UTIL_GOOGLE_CHROME_SXS_DISTRIBUTION_H_

Powered by Google App Engine
This is Rietveld 408576698