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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/installer/util/shell_util.cc

Issue 623903002: Move shell_util's RegistryEntry class into a separate file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@shell_util-generic-associations
Patch Set: Created 6 years, 2 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
« chrome/installer/util/registry_entry.cc ('K') | « chrome/installer/util/registry_entry.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/shell_util.cc
diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc
index cf901ba5f2f1984db042f644b790ffae59e95f5e..34191e7cf32f8dfa97f7ffe4eb7d64d5151037f6 100644
--- a/chrome/installer/util/shell_util.cc
+++ b/chrome/installer/util/shell_util.cc
@@ -47,6 +47,7 @@
#include "chrome/installer/util/l10n_string_util.h"
#include "chrome/installer/util/master_preferences.h"
#include "chrome/installer/util/master_preferences_constants.h"
+#include "chrome/installer/util/registry_entry.h"
#include "chrome/installer/util/util_constants.h"
#include "chrome/installer/util/work_item.h"
@@ -177,592 +178,452 @@ bool UserSpecificRegistrySuffix::GetSuffix(base::string16* suffix) {
return true;
}
-// This class represents a single registry entry. The objective is to
-// encapsulate all the registry entries required for registering Chrome at one
-// place. This class can not be instantiated outside the class and the objects
-// of this class type can be obtained only by calling a static method of this
-// class.
-class RegistryEntry {
- public:
- // A bit-field enum of places to look for this key in the Windows registry.
- enum LookForIn {
- LOOK_IN_HKCU = 1 << 0,
- LOOK_IN_HKLM = 1 << 1,
- LOOK_IN_HKCU_THEN_HKLM = LOOK_IN_HKCU | LOOK_IN_HKLM,
- };
-
- // Details about a Windows application, to be entered into the registry for
- // the purpose of file associations.
- struct ApplicationInfo {
- ApplicationInfo() : file_type_icon_index(0), application_icon_index(0) {}
-
- // The ProgId used by Windows for file associations with this application.
- // Must not be empty or start with a '.'.
- base::string16 prog_id;
- // The friendly name, and the path of the icon that will be used for files
- // of these types when associated with this application by default. (They
- // are NOT the name/icon that will represent the application under the Open
- // With menu.)
- base::string16 file_type_name;
- // TODO(mgiuca): |file_type_icon_path| should be a base::FilePath.
- base::string16 file_type_icon_path;
- int file_type_icon_index;
- // The command to execute when opening a file via this association. It
- // should contain "%1" (to tell Windows to pass the filename as an
- // argument).
- // TODO(mgiuca): |command_line| should be a base::CommandLine.
- base::string16 command_line;
- // The AppUserModelId used by Windows 8 for this application. Distinct from
- // |prog_id|.
- base::string16 app_id;
-
- // User-visible details about this application. Any of these may be empty.
- base::string16 application_name;
- // TODO(mgiuca): |application_icon_path| should be a base::FilePath.
- base::string16 application_icon_path;
- int application_icon_index;
- base::string16 application_description;
- base::string16 publisher_name;
-
- // The CLSID for the application's DelegateExecute handler. May be empty.
- base::string16 delegate_clsid;
- };
-
- // Returns the Windows browser client registration key for Chrome. For
- // example: "Software\Clients\StartMenuInternet\Chromium[.user]". Strictly
- // speaking, we should use the name of the executable (e.g., "chrome.exe"),
- // but that ship has sailed. The cost of switching now is re-prompting users
- // to make Chrome their default browser, which isn't polite. |suffix| is the
- // user-specific registration suffix; see GetUserSpecificDefaultBrowserSuffix
- // in shell_util.h for details.
- static base::string16 GetBrowserClientKey(BrowserDistribution* dist,
- const base::string16& suffix) {
- DCHECK(suffix.empty() || suffix[0] == L'.');
- return base::string16(ShellUtil::kRegStartMenuInternet)
- .append(1, L'\\')
- .append(dist->GetBaseAppName())
- .append(suffix);
- }
-
- // Returns the Windows Default Programs capabilities key for Chrome. For
- // example:
- // "Software\Clients\StartMenuInternet\Chromium[.user]\Capabilities".
- static base::string16 GetCapabilitiesKey(BrowserDistribution* dist,
- const base::string16& suffix) {
- return GetBrowserClientKey(dist, suffix).append(L"\\Capabilities");
- }
-
- // This method returns a list of all the registry entries that
- // are needed to register this installation's ProgId and AppId.
- // These entries need to be registered in HKLM prior to Win8.
- static void GetChromeProgIdEntries(BrowserDistribution* dist,
- const base::string16& chrome_exe,
- const base::string16& suffix,
- ScopedVector<RegistryEntry>* entries) {
- int chrome_icon_index =
- dist->GetIconIndex(BrowserDistribution::SHORTCUT_CHROME);
-
- ApplicationInfo app_info;
- app_info.prog_id = GetBrowserProgId(suffix);
- app_info.file_type_name = dist->GetBrowserProgIdDesc();
- // File types associated with Chrome are just given the Chrome icon.
- app_info.file_type_icon_path = chrome_exe;
- app_info.file_type_icon_index = chrome_icon_index;
- app_info.command_line = ShellUtil::GetChromeShellOpenCmd(chrome_exe);
- // For user-level installs: entries for the app id will be in HKCU; thus we
- // do not need a suffix on those entries.
- app_info.app_id = ShellUtil::GetBrowserModelId(
- dist, InstallUtil::IsPerUserInstall(chrome_exe.c_str()));
-
- // The command to execute when opening this application via the Metro UI.
- base::string16 delegate_command(
- ShellUtil::GetChromeDelegateCommand(chrome_exe));
- bool set_delegate_execute =
- IsChromeMetroSupported() &&
- dist->GetCommandExecuteImplClsid(&app_info.delegate_clsid);
-
- // TODO(grt): http://crbug.com/75152 Write a reference to a localized
- // resource for name, description, and company.
- app_info.application_name = dist->GetDisplayName();
- app_info.application_icon_path = chrome_exe;
- app_info.application_icon_index = chrome_icon_index;
- app_info.application_description = dist->GetAppDescription();
- app_info.publisher_name = dist->GetPublisherName();
-
- GetProgIdEntries(app_info, entries);
-
- // DelegateExecute ProgId. Needed for Chrome Metro in Windows 8. This is
- // only needed for registring a web browser, not for general associations.
- if (set_delegate_execute) {
- base::string16 model_id_shell(ShellUtil::kRegClasses);
- model_id_shell.push_back(base::FilePath::kSeparators[0]);
- model_id_shell.append(app_info.app_id);
- model_id_shell.append(ShellUtil::kRegExePath);
- model_id_shell.append(ShellUtil::kRegShellPath);
-
- // <root hkey>\Software\Classes\<app_id>\.exe\shell @=open
- entries->push_back(new RegistryEntry(model_id_shell,
- ShellUtil::kRegVerbOpen));
-
- // Each of Chrome's shortcuts has an appid; which, as of Windows 8, is
- // registered to handle some verbs. This registration has the side-effect
- // that these verbs now show up in the shortcut's context menu. We
- // mitigate this side-effect by making the context menu entries
- // user readable/localized strings. See relevant MSDN article:
- // http://msdn.microsoft.com/en-US/library/windows/desktop/cc144171.aspx
- const struct {
- const wchar_t* verb;
- int name_id;
- } verbs[] = {
- { ShellUtil::kRegVerbOpen, -1 },
- { ShellUtil::kRegVerbOpenNewWindow, IDS_SHORTCUT_NEW_WINDOW_BASE },
- };
- for (size_t i = 0; i < arraysize(verbs); ++i) {
- base::string16 sub_path(model_id_shell);
- sub_path.push_back(base::FilePath::kSeparators[0]);
- sub_path.append(verbs[i].verb);
-
- // <root hkey>\Software\Classes\<app_id>\.exe\shell\<verb>
- if (verbs[i].name_id != -1) {
- // TODO(grt): http://crbug.com/75152 Write a reference to a localized
- // resource.
- base::string16 verb_name(
- installer::GetLocalizedString(verbs[i].name_id));
- entries->push_back(new RegistryEntry(sub_path, verb_name.c_str()));
- }
- entries->push_back(new RegistryEntry(
- sub_path, L"CommandId", L"Browser.Launch"));
-
- sub_path.push_back(base::FilePath::kSeparators[0]);
- sub_path.append(ShellUtil::kRegCommand);
+// Returns the Windows browser client registration key for Chrome. For example:
+// "Software\Clients\StartMenuInternet\Chromium[.user]". Strictly speaking, we
+// should use the name of the executable (e.g., "chrome.exe"), but that ship has
+// sailed. The cost of switching now is re-prompting users to make Chrome their
+// default browser, which isn't polite. |suffix| is the user-specific
+// registration suffix; see GetUserSpecificDefaultBrowserSuffix in shell_util.h
+// for details.
+base::string16 GetBrowserClientKey(BrowserDistribution* dist,
+ const base::string16& suffix) {
+ DCHECK(suffix.empty() || suffix[0] == L'.');
+ return base::string16(ShellUtil::kRegStartMenuInternet)
+ .append(1, L'\\')
+ .append(dist->GetBaseAppName())
+ .append(suffix);
+}
+
+// Returns the Windows Default Programs capabilities key for Chrome. For
+// example:
+// "Software\Clients\StartMenuInternet\Chromium[.user]\Capabilities".
+base::string16 GetCapabilitiesKey(BrowserDistribution* dist,
+ const base::string16& suffix) {
+ return GetBrowserClientKey(dist, suffix).append(L"\\Capabilities");
+}
+
+// Details about a Windows application, to be entered into the registry for the
+// purpose of file associations.
+struct ApplicationInfo {
+ ApplicationInfo() : file_type_icon_index(0), application_icon_index(0) {}
+
+ // The ProgId used by Windows for file associations with this application.
+ // Must not be empty or start with a '.'.
+ base::string16 prog_id;
+ // The friendly name, and the path of the icon that will be used for files of
+ // these types when associated with this application by default. (They are NOT
+ // the name/icon that will represent the application under the Open With
+ // menu.)
+ base::string16 file_type_name;
+ // TODO(mgiuca): |file_type_icon_path| should be a base::FilePath.
+ base::string16 file_type_icon_path;
+ int file_type_icon_index;
+ // The command to execute when opening a file via this association. It should
+ // contain "%1" (to tell Windows to pass the filename as an argument).
+ // TODO(mgiuca): |command_line| should be a base::CommandLine.
+ base::string16 command_line;
+ // The AppUserModelId used by Windows 8 for this application. Distinct from
+ // |prog_id|.
+ base::string16 app_id;
- // <root hkey>\Software\Classes\<app_id>\.exe\shell\<verb>\command
- entries->push_back(new RegistryEntry(sub_path, delegate_command));
- entries->push_back(new RegistryEntry(
- sub_path, ShellUtil::kRegDelegateExecute, app_info.delegate_clsid));
- }
- }
- }
+ // User-visible details about this application. Any of these may be empty.
+ base::string16 application_name;
+ // TODO(mgiuca): |application_icon_path| should be a base::FilePath.
+ base::string16 application_icon_path;
+ int application_icon_index;
+ base::string16 application_description;
+ base::string16 publisher_name;
- // Gets the registry entries to register an application in the Windows
- // registry. |app_info| provides all of the information needed.
- static void GetProgIdEntries(const ApplicationInfo& app_info,
- ScopedVector<RegistryEntry>* entries) {
- // Basic sanity checks.
- DCHECK(!app_info.prog_id.empty());
- DCHECK_NE(L'.', app_info.prog_id[0]);
+ // The CLSID for the application's DelegateExecute handler. May be empty.
+ base::string16 delegate_clsid;
+};
- // File association ProgId
- base::string16 prog_id_path(ShellUtil::kRegClasses);
- prog_id_path.push_back(base::FilePath::kSeparators[0]);
- prog_id_path.append(app_info.prog_id);
+// Gets the registry entries to register an application in the Windows registry.
+// |app_info| provides all of the information needed.
+void GetProgIdEntries(const ApplicationInfo& app_info,
+ ScopedVector<RegistryEntry>* entries) {
+ // Basic sanity checks.
+ DCHECK(!app_info.prog_id.empty());
+ DCHECK_NE(L'.', app_info.prog_id[0]);
+
+ // File association ProgId
+ base::string16 prog_id_path(ShellUtil::kRegClasses);
+ prog_id_path.push_back(base::FilePath::kSeparators[0]);
+ prog_id_path.append(app_info.prog_id);
+ entries->push_back(new RegistryEntry(prog_id_path, app_info.file_type_name));
+ entries->push_back(new RegistryEntry(
+ prog_id_path + ShellUtil::kRegDefaultIcon,
+ ShellUtil::FormatIconLocation(app_info.file_type_icon_path,
+ app_info.file_type_icon_index)));
+ entries->push_back(new RegistryEntry(prog_id_path + ShellUtil::kRegShellOpen,
+ app_info.command_line));
+ if (!app_info.delegate_clsid.empty()) {
entries->push_back(
- new RegistryEntry(prog_id_path, app_info.file_type_name));
- entries->push_back(new RegistryEntry(
- prog_id_path + ShellUtil::kRegDefaultIcon,
- ShellUtil::FormatIconLocation(app_info.file_type_icon_path,
- app_info.file_type_icon_index)));
- entries->push_back(new RegistryEntry(
- prog_id_path + ShellUtil::kRegShellOpen, app_info.command_line));
- if (!app_info.delegate_clsid.empty()) {
- entries->push_back(
- new RegistryEntry(prog_id_path + ShellUtil::kRegShellOpen,
- ShellUtil::kRegDelegateExecute,
- app_info.delegate_clsid));
- }
-
- // The following entries are required as of Windows 8, but do not
- // depend on the DelegateExecute verb handler being set.
- if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
- if (!app_info.app_id.empty()) {
- entries->push_back(new RegistryEntry(
- prog_id_path, ShellUtil::kRegAppUserModelId, app_info.app_id));
- }
+ new RegistryEntry(prog_id_path + ShellUtil::kRegShellOpen,
+ ShellUtil::kRegDelegateExecute,
+ app_info.delegate_clsid));
+ }
- // Add \Software\Classes\<prog_id>\Application entries
- base::string16 application_path(prog_id_path +
- ShellUtil::kRegApplication);
- if (!app_info.app_id.empty()) {
- entries->push_back(new RegistryEntry(
- application_path, ShellUtil::kRegAppUserModelId, app_info.app_id));
- }
- if (!app_info.application_icon_path.empty()) {
- entries->push_back(new RegistryEntry(
- application_path,
- ShellUtil::kRegApplicationIcon,
- ShellUtil::FormatIconLocation(app_info.application_icon_path,
- app_info.application_icon_index)));
- }
- if (!app_info.application_name.empty()) {
- entries->push_back(new RegistryEntry(application_path,
- ShellUtil::kRegApplicationName,
- app_info.application_name));
- }
- if (!app_info.application_description.empty()) {
- entries->push_back(
- new RegistryEntry(application_path,
- ShellUtil::kRegApplicationDescription,
- app_info.application_description));
- }
- if (!app_info.publisher_name.empty()) {
- entries->push_back(new RegistryEntry(application_path,
- ShellUtil::kRegApplicationCompany,
- app_info.publisher_name));
- }
+ // The following entries are required as of Windows 8, but do not
+ // depend on the DelegateExecute verb handler being set.
+ if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
+ if (!app_info.app_id.empty()) {
+ entries->push_back(new RegistryEntry(
+ prog_id_path, ShellUtil::kRegAppUserModelId, app_info.app_id));
}
- }
- // This method returns a list of the registry entries needed to declare a
- // capability of handling a protocol on Windows.
- static void GetProtocolCapabilityEntries(
- BrowserDistribution* dist,
- const base::string16& suffix,
- const base::string16& protocol,
- ScopedVector<RegistryEntry>* entries) {
- entries->push_back(new RegistryEntry(
- GetCapabilitiesKey(dist, suffix).append(L"\\URLAssociations"),
- protocol, GetBrowserProgId(suffix)));
- }
-
- // This method returns a list of the registry entries required to register
- // this installation in "RegisteredApplications" on Windows (to appear in
- // Default Programs, StartMenuInternet, etc.).
- // These entries need to be registered in HKLM prior to Win8.
- // If |suffix| is not empty, these entries are guaranteed to be unique on this
- // machine.
- static void GetShellIntegrationEntries(BrowserDistribution* dist,
- const base::string16& chrome_exe,
- const base::string16& suffix,
- ScopedVector<RegistryEntry>* entries) {
- const base::string16 icon_path(
- ShellUtil::FormatIconLocation(
- chrome_exe,
- dist->GetIconIndex(BrowserDistribution::SHORTCUT_CHROME)));
- const base::string16 quoted_exe_path(L"\"" + chrome_exe + L"\"");
-
- // Register for the Start Menu "Internet" link (pre-Win7).
- const base::string16 start_menu_entry(GetBrowserClientKey(dist, suffix));
- // Register Chrome's display name.
- // TODO(grt): http://crbug.com/75152 Also set LocalizedString; see
- // http://msdn.microsoft.com/en-us/library/windows/desktop/cc144109(v=VS.85).aspx#registering_the_display_name
- entries->push_back(new RegistryEntry(
- start_menu_entry, dist->GetDisplayName()));
- // Register the "open" verb for launching Chrome via the "Internet" link.
- entries->push_back(new RegistryEntry(
- start_menu_entry + ShellUtil::kRegShellOpen, quoted_exe_path));
- // Register Chrome's icon for the Start Menu "Internet" link.
- entries->push_back(new RegistryEntry(
- start_menu_entry + ShellUtil::kRegDefaultIcon, icon_path));
-
- // Register installation information.
- base::string16 install_info(start_menu_entry + L"\\InstallInfo");
- // Note: not using CommandLine since it has ambiguous rules for quoting
- // strings.
- entries->push_back(new RegistryEntry(install_info, kReinstallCommand,
- quoted_exe_path + L" --" +
- base::ASCIIToWide(switches::kMakeDefaultBrowser)));
- entries->push_back(new RegistryEntry(install_info, L"HideIconsCommand",
- quoted_exe_path + L" --" +
- base::ASCIIToWide(switches::kHideIcons)));
- entries->push_back(new RegistryEntry(install_info, L"ShowIconsCommand",
- quoted_exe_path + L" --" +
- base::ASCIIToWide(switches::kShowIcons)));
- entries->push_back(new RegistryEntry(install_info, L"IconsVisible", 1));
-
- // Register with Default Programs.
- const base::string16 reg_app_name(dist->GetBaseAppName().append(suffix));
- // Tell Windows where to find Chrome's Default Programs info.
- const base::string16 capabilities(GetCapabilitiesKey(dist, suffix));
- entries->push_back(new RegistryEntry(ShellUtil::kRegRegisteredApplications,
- reg_app_name, capabilities));
- // Write out Chrome's Default Programs info.
- // TODO(grt): http://crbug.com/75152 Write a reference to a localized
- // resource rather than this.
- entries->push_back(new RegistryEntry(
- capabilities, ShellUtil::kRegApplicationDescription,
- dist->GetLongAppDescription()));
- entries->push_back(new RegistryEntry(
- capabilities, ShellUtil::kRegApplicationIcon, icon_path));
- entries->push_back(new RegistryEntry(
- capabilities, ShellUtil::kRegApplicationName,
- dist->GetDisplayName()));
-
- entries->push_back(new RegistryEntry(capabilities + L"\\Startmenu",
- L"StartMenuInternet", reg_app_name));
-
- const base::string16 html_prog_id(GetBrowserProgId(suffix));
- for (int i = 0; ShellUtil::kPotentialFileAssociations[i] != NULL; i++) {
+ // Add \Software\Classes\<prog_id>\Application entries
+ base::string16 application_path(prog_id_path + ShellUtil::kRegApplication);
+ if (!app_info.app_id.empty()) {
entries->push_back(new RegistryEntry(
- capabilities + L"\\FileAssociations",
- ShellUtil::kPotentialFileAssociations[i], html_prog_id));
+ application_path, ShellUtil::kRegAppUserModelId, app_info.app_id));
}
- for (int i = 0; ShellUtil::kPotentialProtocolAssociations[i] != NULL;
- i++) {
+ if (!app_info.application_icon_path.empty()) {
entries->push_back(new RegistryEntry(
- capabilities + L"\\URLAssociations",
- ShellUtil::kPotentialProtocolAssociations[i], html_prog_id));
+ application_path,
+ ShellUtil::kRegApplicationIcon,
+ ShellUtil::FormatIconLocation(app_info.application_icon_path,
+ app_info.application_icon_index)));
}
- }
-
- // This method returns a list of the registry entries required for this
- // installation to be registered in the Windows shell.
- // In particular:
- // - App Paths
- // http://msdn.microsoft.com/en-us/library/windows/desktop/ee872121
- // - File Associations
- // http://msdn.microsoft.com/en-us/library/bb166549
- // These entries need to be registered in HKLM prior to Win8.
- static void GetChromeAppRegistrationEntries(
- const base::string16& chrome_exe,
- const base::string16& suffix,
- ScopedVector<RegistryEntry>* entries) {
- const base::FilePath chrome_path(chrome_exe);
- base::string16 app_path_key(ShellUtil::kAppPathsRegistryKey);
- app_path_key.push_back(base::FilePath::kSeparators[0]);
- app_path_key.append(chrome_path.BaseName().value());
- entries->push_back(new RegistryEntry(app_path_key, chrome_exe));
- entries->push_back(new RegistryEntry(app_path_key,
- ShellUtil::kAppPathsRegistryPathName, chrome_path.DirName().value()));
-
- const base::string16 html_prog_id(GetBrowserProgId(suffix));
- for (int i = 0; ShellUtil::kPotentialFileAssociations[i] != NULL; i++) {
- GetAppExtRegistrationEntries(
- html_prog_id, ShellUtil::kPotentialFileAssociations[i], entries);
+ if (!app_info.application_name.empty()) {
+ entries->push_back(new RegistryEntry(application_path,
+ ShellUtil::kRegApplicationName,
+ app_info.application_name));
}
- }
-
- // Gets the registry entries to register an application as a handler for a
- // particular file extension. |prog_id| is the ProgId used by Windows for the
- // application. |ext| is the file extension, which must begin with a '.'.
- static void GetAppExtRegistrationEntries(
- const base::string16& prog_id,
- const base::string16& ext,
- ScopedVector<RegistryEntry>* entries) {
- // In HKEY_CURRENT_USER\Software\Classes\EXT\OpenWithProgids, create an
- // empty value with this class's ProgId.
- base::string16 key_name(ShellUtil::kRegClasses);
- key_name.push_back(base::FilePath::kSeparators[0]);
- key_name.append(ext);
- key_name.push_back(base::FilePath::kSeparators[0]);
- key_name.append(ShellUtil::kRegOpenWithProgids);
- entries->push_back(new RegistryEntry(key_name, prog_id, base::string16()));
- }
-
- // Gets the registry entries to register an application as the default handler
- // for a particular file extension. |prog_id| is the ProgId used by Windows
- // for the application. |ext| is the file extension, which must begin with a
- // '.'. If |overwrite_existing|, always sets the default handler; otherwise
- // only sets if there is no existing default.
- //
- // This has no effect on Windows 8. Windows 8 ignores the default and lets the
- // user choose. If there is only one handler for a file, it will automatically
- // become the default. Otherwise, the first time the user opens a file, they
- // are presented with the dialog to set the default handler. (This is roughly
- // equivalent to being called with |overwrite_existing| false.)
- static void GetAppDefaultRegistrationEntries(
- const base::string16& prog_id,
- const base::string16& ext,
- bool overwrite_existing,
- ScopedVector<RegistryEntry>* entries) {
- // Set the default value of HKEY_CURRENT_USER\Software\Classes\EXT to this
- // class's name.
- base::string16 key_name(ShellUtil::kRegClasses);
- key_name.push_back(base::FilePath::kSeparators[0]);
- key_name.append(ext);
- scoped_ptr<RegistryEntry> default_association(
- new RegistryEntry(key_name, prog_id));
- if (overwrite_existing ||
- !default_association->KeyExistsInRegistry(
- RegistryEntry::LOOK_IN_HKCU)) {
- entries->push_back(default_association.release());
+ if (!app_info.application_description.empty()) {
+ entries->push_back(
+ new RegistryEntry(application_path,
+ ShellUtil::kRegApplicationDescription,
+ app_info.application_description));
}
- }
-
- // This method returns a list of all the user level registry entries that
- // are needed to make Chromium the default handler for a protocol on XP.
- static void GetXPStyleUserProtocolEntries(
- const base::string16& protocol,
- const base::string16& chrome_icon,
- const base::string16& chrome_open,
- ScopedVector<RegistryEntry>* entries) {
- // Protocols associations.
- base::string16 url_key(ShellUtil::kRegClasses);
- url_key.push_back(base::FilePath::kSeparators[0]);
- url_key.append(protocol);
-
- // This registry value tells Windows that this 'class' is a URL scheme
- // so IE, explorer and other apps will route it to our handler.
- // <root hkey>\Software\Classes\<protocol>\URL Protocol
- entries->push_back(new RegistryEntry(url_key,
- ShellUtil::kRegUrlProtocol, base::string16()));
-
- // <root hkey>\Software\Classes\<protocol>\DefaultIcon
- base::string16 icon_key = url_key + ShellUtil::kRegDefaultIcon;
- entries->push_back(new RegistryEntry(icon_key, chrome_icon));
-
- // <root hkey>\Software\Classes\<protocol>\shell\open\command
- base::string16 shell_key = url_key + ShellUtil::kRegShellOpen;
- entries->push_back(new RegistryEntry(shell_key, chrome_open));
-
- // <root hkey>\Software\Classes\<protocol>\shell\open\ddeexec
- base::string16 dde_key = url_key + L"\\shell\\open\\ddeexec";
- entries->push_back(new RegistryEntry(dde_key, base::string16()));
-
- // <root hkey>\Software\Classes\<protocol>\shell\@
- base::string16 protocol_shell_key = url_key + ShellUtil::kRegShellPath;
- entries->push_back(new RegistryEntry(protocol_shell_key, L"open"));
- }
-
- // This method returns a list of all the user level registry entries that
- // are needed to make Chromium default browser on XP.
- // Some of these entries are irrelevant in recent versions of Windows, but
- // we register them anyways as some legacy apps are hardcoded to lookup those
- // values.
- static void GetXPStyleDefaultBrowserUserEntries(
- BrowserDistribution* dist,
- const base::string16& chrome_exe,
- const base::string16& suffix,
- ScopedVector<RegistryEntry>* entries) {
- // File extension associations.
- base::string16 html_prog_id(GetBrowserProgId(suffix));
- for (int i = 0; ShellUtil::kDefaultFileAssociations[i] != NULL; i++) {
- GetAppDefaultRegistrationEntries(
- html_prog_id, ShellUtil::kDefaultFileAssociations[i], true, entries);
+ if (!app_info.publisher_name.empty()) {
+ entries->push_back(new RegistryEntry(application_path,
+ ShellUtil::kRegApplicationCompany,
+ app_info.publisher_name));
}
+ }
+}
- // Protocols associations.
- base::string16 chrome_open = ShellUtil::GetChromeShellOpenCmd(chrome_exe);
- base::string16 chrome_icon =
- ShellUtil::FormatIconLocation(
- chrome_exe,
- dist->GetIconIndex(BrowserDistribution::SHORTCUT_CHROME));
- for (int i = 0; ShellUtil::kBrowserProtocolAssociations[i] != NULL; i++) {
- GetXPStyleUserProtocolEntries(ShellUtil::kBrowserProtocolAssociations[i],
- chrome_icon, chrome_open, entries);
- }
+// This method returns a list of all the registry entries that are needed to
+// register this installation's ProgId and AppId. These entries need to be
+// registered in HKLM prior to Win8.
+void GetChromeProgIdEntries(BrowserDistribution* dist,
+ const base::string16& chrome_exe,
+ const base::string16& suffix,
+ ScopedVector<RegistryEntry>* entries) {
+ int chrome_icon_index =
+ dist->GetIconIndex(BrowserDistribution::SHORTCUT_CHROME);
+
+ ApplicationInfo app_info;
+ app_info.prog_id = GetBrowserProgId(suffix);
+ app_info.file_type_name = dist->GetBrowserProgIdDesc();
+ // File types associated with Chrome are just given the Chrome icon.
+ app_info.file_type_icon_path = chrome_exe;
+ app_info.file_type_icon_index = chrome_icon_index;
+ app_info.command_line = ShellUtil::GetChromeShellOpenCmd(chrome_exe);
+ // For user-level installs: entries for the app id will be in HKCU; thus we
+ // do not need a suffix on those entries.
+ app_info.app_id = ShellUtil::GetBrowserModelId(
+ dist, InstallUtil::IsPerUserInstall(chrome_exe.c_str()));
+
+ // The command to execute when opening this application via the Metro UI.
+ base::string16 delegate_command(
+ ShellUtil::GetChromeDelegateCommand(chrome_exe));
+ bool set_delegate_execute =
+ IsChromeMetroSupported() &&
+ dist->GetCommandExecuteImplClsid(&app_info.delegate_clsid);
+
+ // TODO(grt): http://crbug.com/75152 Write a reference to a localized
+ // resource for name, description, and company.
+ app_info.application_name = dist->GetDisplayName();
+ app_info.application_icon_path = chrome_exe;
+ app_info.application_icon_index = chrome_icon_index;
+ app_info.application_description = dist->GetAppDescription();
+ app_info.publisher_name = dist->GetPublisherName();
+
+ GetProgIdEntries(app_info, entries);
+
+ // DelegateExecute ProgId. Needed for Chrome Metro in Windows 8. This is
+ // only needed for registring a web browser, not for general associations.
+ if (set_delegate_execute) {
+ base::string16 model_id_shell(ShellUtil::kRegClasses);
+ model_id_shell.push_back(base::FilePath::kSeparators[0]);
+ model_id_shell.append(app_info.app_id);
+ model_id_shell.append(ShellUtil::kRegExePath);
+ model_id_shell.append(ShellUtil::kRegShellPath);
+
+ // <root hkey>\Software\Classes\<app_id>\.exe\shell @=open
+ entries->push_back(
+ new RegistryEntry(model_id_shell, ShellUtil::kRegVerbOpen));
+
+ // Each of Chrome's shortcuts has an appid; which, as of Windows 8, is
+ // registered to handle some verbs. This registration has the side-effect
+ // that these verbs now show up in the shortcut's context menu. We
+ // mitigate this side-effect by making the context menu entries
+ // user readable/localized strings. See relevant MSDN article:
+ // http://msdn.microsoft.com/en-US/library/windows/desktop/cc144171.aspx
+ const struct {
+ const wchar_t* verb;
+ int name_id;
+ } verbs[] = {
+ {ShellUtil::kRegVerbOpen, -1},
+ {ShellUtil::kRegVerbOpenNewWindow, IDS_SHORTCUT_NEW_WINDOW_BASE},
+ };
+ for (size_t i = 0; i < arraysize(verbs); ++i) {
+ base::string16 sub_path(model_id_shell);
+ sub_path.push_back(base::FilePath::kSeparators[0]);
+ sub_path.append(verbs[i].verb);
+
+ // <root hkey>\Software\Classes\<app_id>\.exe\shell\<verb>
+ if (verbs[i].name_id != -1) {
+ // TODO(grt): http://crbug.com/75152 Write a reference to a localized
+ // resource.
+ base::string16 verb_name(
+ installer::GetLocalizedString(verbs[i].name_id));
+ entries->push_back(new RegistryEntry(sub_path, verb_name.c_str()));
+ }
+ entries->push_back(
+ new RegistryEntry(sub_path, L"CommandId", L"Browser.Launch"));
- // start->Internet shortcut.
- base::string16 start_menu(ShellUtil::kRegStartMenuInternet);
- base::string16 app_name = dist->GetBaseAppName() + suffix;
- entries->push_back(new RegistryEntry(start_menu, app_name));
- }
+ sub_path.push_back(base::FilePath::kSeparators[0]);
+ sub_path.append(ShellUtil::kRegCommand);
- // Generate work_item tasks required to create current registry entry and
- // add them to the given work item list.
- void AddToWorkItemList(HKEY root, WorkItemList *items) const {
- items->AddCreateRegKeyWorkItem(root, key_path_, WorkItem::kWow64Default);
- if (is_string_) {
- items->AddSetRegValueWorkItem(
- root, key_path_, WorkItem::kWow64Default, name_, value_, true);
- } else {
- items->AddSetRegValueWorkItem(
- root, key_path_, WorkItem::kWow64Default, name_, int_value_, true);
+ // <root hkey>\Software\Classes\<app_id>\.exe\shell\<verb>\command
+ entries->push_back(new RegistryEntry(sub_path, delegate_command));
+ entries->push_back(new RegistryEntry(
+ sub_path, ShellUtil::kRegDelegateExecute, app_info.delegate_clsid));
}
}
+}
- // Checks if the current registry entry exists in HKCU\|key_path_|\|name_|
- // and value is |value_|. If the key does NOT exist in HKCU, checks for
- // the correct name and value in HKLM.
- // |look_for_in| specifies roots (HKCU and/or HKLM) in which to look for the
- // key, unspecified roots are not looked into (i.e. the the key is assumed not
- // to exist in them).
- // |look_for_in| must at least specify one root to look into.
- // If |look_for_in| is LOOK_IN_HKCU_THEN_HKLM, this method mimics Windows'
- // behavior when searching in HKCR (HKCU takes precedence over HKLM). For
- // registrations outside of HKCR on versions of Windows prior to Win8,
- // Chrome's values go in HKLM. This function will make unnecessary (but
- // harmless) queries into HKCU in that case.
- bool ExistsInRegistry(uint32 look_for_in) const {
- DCHECK(look_for_in);
-
- RegistryStatus status = DOES_NOT_EXIST;
- if (look_for_in & LOOK_IN_HKCU)
- status = StatusInRegistryUnderRoot(HKEY_CURRENT_USER);
- if (status == DOES_NOT_EXIST && (look_for_in & LOOK_IN_HKLM))
- status = StatusInRegistryUnderRoot(HKEY_LOCAL_MACHINE);
- return status == SAME_VALUE;
- }
-
- // Checks if the current registry entry exists in \|key_path_|\|name_|,
- // regardless of value. Same lookup rules as ExistsInRegistry.
- // Unlike ExistsInRegistry, this returns true if some other value is present
- // with the same key.
- bool KeyExistsInRegistry(uint32 look_for_in) const {
- DCHECK(look_for_in);
-
- RegistryStatus status = DOES_NOT_EXIST;
- if (look_for_in & LOOK_IN_HKCU)
- status = StatusInRegistryUnderRoot(HKEY_CURRENT_USER);
- if (status == DOES_NOT_EXIST && (look_for_in & LOOK_IN_HKLM))
- status = StatusInRegistryUnderRoot(HKEY_LOCAL_MACHINE);
- return status != DOES_NOT_EXIST;
+// This method returns a list of the registry entries needed to declare a
+// capability of handling a protocol on Windows.
+void GetProtocolCapabilityEntries(BrowserDistribution* dist,
+ const base::string16& suffix,
+ const base::string16& protocol,
+ ScopedVector<RegistryEntry>* entries) {
+ entries->push_back(new RegistryEntry(
+ GetCapabilitiesKey(dist, suffix).append(L"\\URLAssociations"),
+ protocol,
+ GetBrowserProgId(suffix)));
+}
+
+// This method returns a list of the registry entries required to register this
+// installation in "RegisteredApplications" on Windows (to appear in Default
+// Programs, StartMenuInternet, etc.). These entries need to be registered in
+// HKLM prior to Win8. If |suffix| is not empty, these entries are guaranteed to
+// be unique on this machine.
+void GetShellIntegrationEntries(BrowserDistribution* dist,
+ const base::string16& chrome_exe,
+ const base::string16& suffix,
+ ScopedVector<RegistryEntry>* entries) {
+ const base::string16 icon_path(ShellUtil::FormatIconLocation(
+ chrome_exe, dist->GetIconIndex(BrowserDistribution::SHORTCUT_CHROME)));
+ const base::string16 quoted_exe_path(L"\"" + chrome_exe + L"\"");
+
+ // Register for the Start Menu "Internet" link (pre-Win7).
+ const base::string16 start_menu_entry(GetBrowserClientKey(dist, suffix));
+ // Register Chrome's display name.
+ // TODO(grt): http://crbug.com/75152 Also set LocalizedString; see
+ // http://msdn.microsoft.com/en-us/library/windows/desktop/cc144109(v=VS.85).aspx#registering_the_display_name
+ entries->push_back(
+ new RegistryEntry(start_menu_entry, dist->GetDisplayName()));
+ // Register the "open" verb for launching Chrome via the "Internet" link.
+ entries->push_back(new RegistryEntry(
+ start_menu_entry + ShellUtil::kRegShellOpen, quoted_exe_path));
+ // Register Chrome's icon for the Start Menu "Internet" link.
+ entries->push_back(new RegistryEntry(
+ start_menu_entry + ShellUtil::kRegDefaultIcon, icon_path));
+
+ // Register installation information.
+ base::string16 install_info(start_menu_entry + L"\\InstallInfo");
+ // Note: not using CommandLine since it has ambiguous rules for quoting
+ // strings.
+ entries->push_back(
+ new RegistryEntry(install_info,
+ kReinstallCommand,
+ quoted_exe_path + L" --" +
+ base::ASCIIToWide(switches::kMakeDefaultBrowser)));
+ entries->push_back(new RegistryEntry(
+ install_info,
+ L"HideIconsCommand",
+ quoted_exe_path + L" --" + base::ASCIIToWide(switches::kHideIcons)));
+ entries->push_back(new RegistryEntry(
+ install_info,
+ L"ShowIconsCommand",
+ quoted_exe_path + L" --" + base::ASCIIToWide(switches::kShowIcons)));
+ entries->push_back(new RegistryEntry(install_info, L"IconsVisible", 1));
+
+ // Register with Default Programs.
+ const base::string16 reg_app_name(dist->GetBaseAppName().append(suffix));
+ // Tell Windows where to find Chrome's Default Programs info.
+ const base::string16 capabilities(GetCapabilitiesKey(dist, suffix));
+ entries->push_back(new RegistryEntry(
+ ShellUtil::kRegRegisteredApplications, reg_app_name, capabilities));
+ // Write out Chrome's Default Programs info.
+ // TODO(grt): http://crbug.com/75152 Write a reference to a localized
+ // resource rather than this.
+ entries->push_back(new RegistryEntry(capabilities,
+ ShellUtil::kRegApplicationDescription,
+ dist->GetLongAppDescription()));
+ entries->push_back(new RegistryEntry(
+ capabilities, ShellUtil::kRegApplicationIcon, icon_path));
+ entries->push_back(new RegistryEntry(
+ capabilities, ShellUtil::kRegApplicationName, dist->GetDisplayName()));
+
+ entries->push_back(new RegistryEntry(
+ capabilities + L"\\Startmenu", L"StartMenuInternet", reg_app_name));
+
+ const base::string16 html_prog_id(GetBrowserProgId(suffix));
+ for (int i = 0; ShellUtil::kPotentialFileAssociations[i] != NULL; i++) {
+ entries->push_back(
+ new RegistryEntry(capabilities + L"\\FileAssociations",
+ ShellUtil::kPotentialFileAssociations[i],
+ html_prog_id));
}
-
- private:
- // States this RegistryKey can be in compared to the registry.
- enum RegistryStatus {
- // |name_| does not exist in the registry
- DOES_NOT_EXIST,
- // |name_| exists, but its value != |value_|
- DIFFERENT_VALUE,
- // |name_| exists and its value is |value_|
- SAME_VALUE,
- };
-
- // Create a object that represent default value of a key
- RegistryEntry(const base::string16& key_path, const base::string16& value)
- : key_path_(key_path), name_(),
- is_string_(true), value_(value), int_value_(0) {
- }
-
- // Create a object that represent a key of type REG_SZ
- RegistryEntry(const base::string16& key_path, const base::string16& name,
- const base::string16& value)
- : key_path_(key_path), name_(name),
- is_string_(true), value_(value), int_value_(0) {
- }
-
- // Create a object that represent a key of integer type
- RegistryEntry(const base::string16& key_path, const base::string16& name,
- DWORD value)
- : key_path_(key_path), name_(name),
- is_string_(false), value_(), int_value_(value) {
- }
-
- base::string16 key_path_; // key path for the registry entry
- base::string16 name_; // name of the registry entry
- bool is_string_; // true if current registry entry is of type REG_SZ
- base::string16 value_; // string value (useful if is_string_ = true)
- DWORD int_value_; // integer value (useful if is_string_ = false)
-
- // Helper function for ExistsInRegistry().
- // Returns the RegistryStatus of the current registry entry in
- // |root|\|key_path_|\|name_|.
- RegistryStatus StatusInRegistryUnderRoot(HKEY root) const {
- RegKey key(root, key_path_.c_str(), KEY_QUERY_VALUE);
- bool found = false;
- bool correct_value = false;
- if (is_string_) {
- base::string16 read_value;
- found = key.ReadValue(name_.c_str(), &read_value) == ERROR_SUCCESS;
- if (found) {
- correct_value = read_value.size() == value_.size() &&
- std::equal(value_.begin(), value_.end(), read_value.begin(),
- base::CaseInsensitiveCompare<wchar_t>());
- }
- } else {
- DWORD read_value;
- found = key.ReadValueDW(name_.c_str(), &read_value) == ERROR_SUCCESS;
- if (found)
- correct_value = read_value == int_value_;
- }
- return found ?
- (correct_value ? SAME_VALUE : DIFFERENT_VALUE) : DOES_NOT_EXIST;
+ for (int i = 0; ShellUtil::kPotentialProtocolAssociations[i] != NULL; i++) {
+ entries->push_back(
+ new RegistryEntry(capabilities + L"\\URLAssociations",
+ ShellUtil::kPotentialProtocolAssociations[i],
+ html_prog_id));
+ }
+}
+
+// Gets the registry entries to register an application as a handler for a
+// particular file extension. |prog_id| is the ProgId used by Windows for the
+// application. |ext| is the file extension, which must begin with a '.'.
+void GetAppExtRegistrationEntries(const base::string16& prog_id,
+ const base::string16& ext,
+ ScopedVector<RegistryEntry>* entries) {
+ // In HKEY_CURRENT_USER\Software\Classes\EXT\OpenWithProgids, create an
+ // empty value with this class's ProgId.
+ base::string16 key_name(ShellUtil::kRegClasses);
+ key_name.push_back(base::FilePath::kSeparators[0]);
+ key_name.append(ext);
+ key_name.push_back(base::FilePath::kSeparators[0]);
+ key_name.append(ShellUtil::kRegOpenWithProgids);
+ entries->push_back(new RegistryEntry(key_name, prog_id, base::string16()));
+}
+
+// This method returns a list of the registry entries required for this
+// installation to be registered in the Windows shell. In particular:
+// - App Paths
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ee872121
+// - File Associations
+// http://msdn.microsoft.com/en-us/library/bb166549
+// These entries need to be registered in HKLM prior to Win8.
+void GetChromeAppRegistrationEntries(const base::string16& chrome_exe,
+ const base::string16& suffix,
+ ScopedVector<RegistryEntry>* entries) {
+ const base::FilePath chrome_path(chrome_exe);
+ base::string16 app_path_key(ShellUtil::kAppPathsRegistryKey);
+ app_path_key.push_back(base::FilePath::kSeparators[0]);
+ app_path_key.append(chrome_path.BaseName().value());
+ entries->push_back(new RegistryEntry(app_path_key, chrome_exe));
+ entries->push_back(new RegistryEntry(app_path_key,
+ ShellUtil::kAppPathsRegistryPathName,
+ chrome_path.DirName().value()));
+
+ const base::string16 html_prog_id(GetBrowserProgId(suffix));
+ for (int i = 0; ShellUtil::kPotentialFileAssociations[i] != NULL; i++) {
+ GetAppExtRegistrationEntries(
+ html_prog_id, ShellUtil::kPotentialFileAssociations[i], entries);
+ }
+}
+
+// Gets the registry entries to register an application as the default handler
+// for a particular file extension. |prog_id| is the ProgId used by Windows for
+// the application. |ext| is the file extension, which must begin with a '.'. If
+// |overwrite_existing|, always sets the default handler; otherwise only sets if
+// there is no existing default.
+//
+// This has no effect on Windows 8. Windows 8 ignores the default and lets the
+// user choose. If there is only one handler for a file, it will automatically
+// become the default. Otherwise, the first time the user opens a file, they are
+// presented with the dialog to set the default handler. (This is roughly
+// equivalent to being called with |overwrite_existing| false.)
+void GetAppDefaultRegistrationEntries(const base::string16& prog_id,
+ const base::string16& ext,
+ bool overwrite_existing,
+ ScopedVector<RegistryEntry>* entries) {
+ // Set the default value of HKEY_CURRENT_USER\Software\Classes\EXT to this
+ // class's name.
+ base::string16 key_name(ShellUtil::kRegClasses);
+ key_name.push_back(base::FilePath::kSeparators[0]);
+ key_name.append(ext);
+ scoped_ptr<RegistryEntry> default_association(
+ new RegistryEntry(key_name, prog_id));
+ if (overwrite_existing ||
+ !default_association->KeyExistsInRegistry(RegistryEntry::LOOK_IN_HKCU)) {
+ entries->push_back(default_association.release());
+ }
+}
+
+// This method returns a list of all the user level registry entries that are
+// needed to make Chromium the default handler for a protocol on XP.
+void GetXPStyleUserProtocolEntries(const base::string16& protocol,
+ const base::string16& chrome_icon,
+ const base::string16& chrome_open,
+ ScopedVector<RegistryEntry>* entries) {
+ // Protocols associations.
+ base::string16 url_key(ShellUtil::kRegClasses);
+ url_key.push_back(base::FilePath::kSeparators[0]);
+ url_key.append(protocol);
+
+ // This registry value tells Windows that this 'class' is a URL scheme
+ // so IE, explorer and other apps will route it to our handler.
+ // <root hkey>\Software\Classes\<protocol>\URL Protocol
+ entries->push_back(
+ new RegistryEntry(url_key, ShellUtil::kRegUrlProtocol, base::string16()));
+
+ // <root hkey>\Software\Classes\<protocol>\DefaultIcon
+ base::string16 icon_key = url_key + ShellUtil::kRegDefaultIcon;
+ entries->push_back(new RegistryEntry(icon_key, chrome_icon));
+
+ // <root hkey>\Software\Classes\<protocol>\shell\open\command
+ base::string16 shell_key = url_key + ShellUtil::kRegShellOpen;
+ entries->push_back(new RegistryEntry(shell_key, chrome_open));
+
+ // <root hkey>\Software\Classes\<protocol>\shell\open\ddeexec
+ base::string16 dde_key = url_key + L"\\shell\\open\\ddeexec";
+ entries->push_back(new RegistryEntry(dde_key, base::string16()));
+
+ // <root hkey>\Software\Classes\<protocol>\shell\@
+ base::string16 protocol_shell_key = url_key + ShellUtil::kRegShellPath;
+ entries->push_back(new RegistryEntry(protocol_shell_key, L"open"));
+}
+
+// This method returns a list of all the user level registry entries that are
+// needed to make Chromium default browser on XP. Some of these entries are
+// irrelevant in recent versions of Windows, but we register them anyways as
+// some legacy apps are hardcoded to lookup those values.
+void GetXPStyleDefaultBrowserUserEntries(BrowserDistribution* dist,
+ const base::string16& chrome_exe,
+ const base::string16& suffix,
+ ScopedVector<RegistryEntry>* entries) {
+ // File extension associations.
+ base::string16 html_prog_id(GetBrowserProgId(suffix));
+ for (int i = 0; ShellUtil::kDefaultFileAssociations[i] != NULL; i++) {
+ GetAppDefaultRegistrationEntries(
+ html_prog_id, ShellUtil::kDefaultFileAssociations[i], true, entries);
}
- DISALLOW_COPY_AND_ASSIGN(RegistryEntry);
-}; // class RegistryEntry
+ // Protocols associations.
+ base::string16 chrome_open = ShellUtil::GetChromeShellOpenCmd(chrome_exe);
+ base::string16 chrome_icon = ShellUtil::FormatIconLocation(
+ chrome_exe, dist->GetIconIndex(BrowserDistribution::SHORTCUT_CHROME));
+ for (int i = 0; ShellUtil::kBrowserProtocolAssociations[i] != NULL; i++) {
+ GetXPStyleUserProtocolEntries(ShellUtil::kBrowserProtocolAssociations[i],
+ chrome_icon,
+ chrome_open,
+ entries);
+ }
+ // start->Internet shortcut.
+ base::string16 start_menu(ShellUtil::kRegStartMenuInternet);
+ base::string16 app_name = dist->GetBaseAppName() + suffix;
+ entries->push_back(new RegistryEntry(start_menu, app_name));
+}
// This method converts all the RegistryEntries from the given list to
// Set/CreateRegWorkItems and runs them using WorkItemList.
@@ -811,9 +672,9 @@ bool IsChromeRegistered(BrowserDistribution* dist,
const base::string16& suffix,
uint32 look_for_in) {
ScopedVector<RegistryEntry> entries;
- RegistryEntry::GetChromeProgIdEntries(dist, chrome_exe, suffix, &entries);
- RegistryEntry::GetShellIntegrationEntries(dist, chrome_exe, suffix, &entries);
- RegistryEntry::GetChromeAppRegistrationEntries(chrome_exe, suffix, &entries);
+ GetChromeProgIdEntries(dist, chrome_exe, suffix, &entries);
+ GetShellIntegrationEntries(dist, chrome_exe, suffix, &entries);
+ GetChromeAppRegistrationEntries(chrome_exe, suffix, &entries);
return AreEntriesRegistered(entries, look_for_in);
}
@@ -825,7 +686,7 @@ bool IsChromeRegisteredForProtocol(BrowserDistribution* dist,
const base::string16& protocol,
uint32 look_for_in) {
ScopedVector<RegistryEntry> entries;
- RegistryEntry::GetProtocolCapabilityEntries(dist, suffix, protocol, &entries);
+ GetProtocolCapabilityEntries(dist, suffix, protocol, &entries);
return AreEntriesRegistered(entries, look_for_in);
}
@@ -939,7 +800,7 @@ bool QuickIsChromeRegistered(BrowserDistribution* dist,
case CONFIRM_SHELL_REGISTRATION:
case CONFIRM_SHELL_REGISTRATION_IN_HKLM:
// Software\Clients\StartMenuInternet\Google Chrome|suffix|
- reg_key = RegistryEntry::GetBrowserClientKey(dist, suffix);
+ reg_key = GetBrowserClientKey(dist, suffix);
break;
default:
NOTREACHED();
@@ -1025,9 +886,11 @@ bool RegisterChromeAsDefaultXPStyle(BrowserDistribution* dist,
const base::string16& chrome_exe) {
bool ret = true;
ScopedVector<RegistryEntry> entries;
- RegistryEntry::GetXPStyleDefaultBrowserUserEntries(
- dist, chrome_exe,
- ShellUtil::GetCurrentInstallationSuffix(dist, chrome_exe), &entries);
+ GetXPStyleDefaultBrowserUserEntries(
+ dist,
+ chrome_exe,
+ ShellUtil::GetCurrentInstallationSuffix(dist, chrome_exe),
+ &entries);
// Change the default browser for current user.
if ((shell_change & ShellUtil::CURRENT_USER) &&
@@ -1061,8 +924,7 @@ bool RegisterChromeAsDefaultProtocolClientXPStyle(
ShellUtil::FormatIconLocation(
chrome_exe,
dist->GetIconIndex(BrowserDistribution::SHORTCUT_CHROME)));
- RegistryEntry::GetXPStyleUserProtocolEntries(protocol, chrome_icon,
- chrome_open, &entries);
+ GetXPStyleUserProtocolEntries(protocol, chrome_icon, chrome_open, &entries);
// Change the default protocol handler for current user.
if (!AddRegistryEntries(HKEY_CURRENT_USER, entries)) {
LOG(ERROR) << "Could not make Chrome default protocol client (XP).";
@@ -2198,12 +2060,11 @@ bool ShellUtil::RegisterChromeBrowser(BrowserDistribution* dist,
// an admin.
ScopedVector<RegistryEntry> progid_and_appreg_entries;
ScopedVector<RegistryEntry> shell_entries;
- RegistryEntry::GetChromeProgIdEntries(
+ GetChromeProgIdEntries(
dist, chrome_exe, suffix, &progid_and_appreg_entries);
- RegistryEntry::GetChromeAppRegistrationEntries(
+ GetChromeAppRegistrationEntries(
chrome_exe, suffix, &progid_and_appreg_entries);
- RegistryEntry::GetShellIntegrationEntries(
- dist, chrome_exe, suffix, &shell_entries);
+ GetShellIntegrationEntries(dist, chrome_exe, suffix, &shell_entries);
result = (AddRegistryEntries(root, progid_and_appreg_entries) &&
AddRegistryEntries(root, shell_entries));
} else if (elevate_if_not_admin &&
@@ -2218,8 +2079,7 @@ bool ShellUtil::RegisterChromeBrowser(BrowserDistribution* dist,
// If we got to this point then all we can do is create ProgId and basic app
// registrations under HKCU.
ScopedVector<RegistryEntry> entries;
- RegistryEntry::GetChromeProgIdEntries(
- dist, chrome_exe, base::string16(), &entries);
+ GetChromeProgIdEntries(dist, chrome_exe, base::string16(), &entries);
// Prefer to use |suffix|; unless Chrome's ProgIds are already registered
// with no suffix (as per the old registration style): in which case some
// other registry entries could refer to them and since we were not able to
@@ -2227,10 +2087,8 @@ bool ShellUtil::RegisterChromeBrowser(BrowserDistribution* dist,
if (!AreEntriesRegistered(entries, RegistryEntry::LOOK_IN_HKCU)) {
if (!suffix.empty()) {
entries.clear();
- RegistryEntry::GetChromeProgIdEntries(
- dist, chrome_exe, suffix, &entries);
- RegistryEntry::GetChromeAppRegistrationEntries(
- chrome_exe, suffix, &entries);
+ GetChromeProgIdEntries(dist, chrome_exe, suffix, &entries);
+ GetChromeAppRegistrationEntries(chrome_exe, suffix, &entries);
}
result = AddRegistryEntries(HKEY_CURRENT_USER, entries);
} else {
@@ -2239,8 +2097,7 @@ bool ShellUtil::RegisterChromeBrowser(BrowserDistribution* dist,
// thus needs to be done after the above check for the unsuffixed
// registration).
entries.clear();
- RegistryEntry::GetChromeAppRegistrationEntries(
- chrome_exe, base::string16(), &entries);
+ GetChromeAppRegistrationEntries(chrome_exe, base::string16(), &entries);
result = AddRegistryEntries(HKEY_CURRENT_USER, entries);
}
}
@@ -2287,8 +2144,7 @@ bool ShellUtil::RegisterChromeForProtocol(BrowserDistribution* dist,
// Write in the capabillity for the protocol.
ScopedVector<RegistryEntry> entries;
- RegistryEntry::GetProtocolCapabilityEntries(dist, suffix, protocol,
- &entries);
+ GetProtocolCapabilityEntries(dist, suffix, protocol, &entries);
return AddRegistryEntries(root, entries);
} else if (elevate_if_not_admin &&
base::win::GetVersion() >= base::win::VERSION_VISTA) {
@@ -2440,13 +2296,13 @@ bool ShellUtil::AddFileAssociations(
ScopedVector<RegistryEntry> entries;
// Create a class for this app.
- RegistryEntry::ApplicationInfo app_info;
+ ApplicationInfo app_info;
app_info.prog_id = prog_id;
app_info.file_type_name = file_type_name;
app_info.file_type_icon_path = icon_path.value();
app_info.file_type_icon_index = 0;
app_info.command_line = command_line.GetCommandLineString();
- RegistryEntry::GetProgIdEntries(app_info, &entries);
+ GetProgIdEntries(app_info, &entries);
// Associate each extension that the app can handle with the class. Set this
// app as the default handler if and only if there is no existing default.
@@ -2458,14 +2314,13 @@ bool ShellUtil::AddFileAssociations(
DCHECK_NE(L'.', (*it)[0]);
base::string16 ext(1, L'.');
ext.append(*it);
- RegistryEntry::GetAppExtRegistrationEntries(prog_id, ext, &entries);
+ GetAppExtRegistrationEntries(prog_id, ext, &entries);
// Regstering as the default will have no effect on Windows 8 (see
// documentation for GetAppDefaultRegistrationEntries). However, if our app
// is the only handler, it will automatically become the default, so the
// same effect is achieved.
- RegistryEntry::GetAppDefaultRegistrationEntries(
- prog_id, ext, false, &entries);
+ GetAppDefaultRegistrationEntries(prog_id, ext, false, &entries);
}
return AddRegistryEntries(HKEY_CURRENT_USER, entries);
« chrome/installer/util/registry_entry.cc ('K') | « chrome/installer/util/registry_entry.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698