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

Side by Side Diff: chrome/installer/util/chrome_frame_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 unified diff | Download patch
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 // This file extends the browser distribution with a specific implementation 5 // This file extends the browser distribution with a specific implementation
6 // for Chrome Frame. 6 // for Chrome Frame.
7 7
8 #ifndef CHROME_INSTALLER_UTIL_CHROME_FRAME_DISTRIBUTION_H_ 8 #ifndef CHROME_INSTALLER_UTIL_CHROME_FRAME_DISTRIBUTION_H_
9 #define CHROME_INSTALLER_UTIL_CHROME_FRAME_DISTRIBUTION_H_ 9 #define CHROME_INSTALLER_UTIL_CHROME_FRAME_DISTRIBUTION_H_
10 10
(...skipping 29 matching lines...) Expand all
40 virtual std::string GetHttpPipeliningTestServer() const OVERRIDE; 40 virtual std::string GetHttpPipeliningTestServer() const OVERRIDE;
41 41
42 virtual string16 GetUninstallLinkName() OVERRIDE; 42 virtual string16 GetUninstallLinkName() OVERRIDE;
43 43
44 virtual string16 GetUninstallRegPath() OVERRIDE; 44 virtual string16 GetUninstallRegPath() OVERRIDE;
45 45
46 virtual string16 GetVersionKey() OVERRIDE; 46 virtual string16 GetVersionKey() OVERRIDE;
47 47
48 virtual string16 GetIconFilename() OVERRIDE; 48 virtual string16 GetIconFilename() OVERRIDE;
49 49
50 virtual bool IsSetAsDefaultSupported() OVERRIDE;
51
50 virtual bool CanSetAsDefault() OVERRIDE; 52 virtual bool CanSetAsDefault() OVERRIDE;
51 53
52 virtual bool CanCreateDesktopShortcuts() OVERRIDE; 54 virtual bool CanCreateDesktopShortcuts() OVERRIDE;
53 55
54 virtual bool GetCommandExecuteImplClsid( 56 virtual bool GetCommandExecuteImplClsidString(
55 string16* handler_class_uuid) OVERRIDE; 57 string16* handler_class_uuid) OVERRIDE;
56 58
59 #if defined(OS_WIN)
60 virtual bool GetCommandExecuteImplClsid(CLSID* handler_class_uuid) OVERRIDE;
61 #endif
62
57 virtual void UpdateInstallStatus(bool system_install, 63 virtual void UpdateInstallStatus(bool system_install,
58 installer::ArchiveType archive_type, 64 installer::ArchiveType archive_type,
59 installer::InstallStatus install_status) OVERRIDE; 65 installer::InstallStatus install_status) OVERRIDE;
60 66
61 protected: 67 protected:
62 friend class BrowserDistribution; 68 friend class BrowserDistribution;
63 69
64 // Disallow construction from non-friends. 70 // Disallow construction from non-friends.
65 ChromeFrameDistribution(); 71 ChromeFrameDistribution();
66 }; 72 };
67 73
68 #endif // CHROME_INSTALLER_UTIL_CHROME_FRAME_DISTRIBUTION_H_ 74 #endif // CHROME_INSTALLER_UTIL_CHROME_FRAME_DISTRIBUTION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698