| Index: chrome/installer/util/shell_util.h
|
| diff --git a/chrome/installer/util/shell_util.h b/chrome/installer/util/shell_util.h
|
| index f1ff503b339070344461221a9a0bdd995de98697..94c6165b2dff94c49bc2a91ee3a4591e987204e6 100644
|
| --- a/chrome/installer/util/shell_util.h
|
| +++ b/chrome/installer/util/shell_util.h
|
| @@ -294,8 +294,7 @@ class ShellUtil {
|
| // Returns true if |chrome_exe| is registered in HKLM with |suffix|.
|
| // Note: This only checks one deterministic key in HKLM for |chrome_exe| and
|
| // doesn't otherwise validate a full Chrome install in HKLM.
|
| - static bool QuickIsChromeRegisteredInHKLM(BrowserDistribution* dist,
|
| - const base::FilePath& chrome_exe,
|
| + static bool QuickIsChromeRegisteredInHKLM(const base::FilePath& chrome_exe,
|
| const base::string16& suffix);
|
|
|
| // Returns true if the current Windows version supports the presence of
|
| @@ -358,7 +357,6 @@ class ShellUtil {
|
| // method looks in both and gives precedence to values in HKCU as per the msdn
|
| // standard: http://goo.gl/xjczJ.
|
| static void GetRegisteredBrowsers(
|
| - BrowserDistribution* dist,
|
| std::map<base::string16, base::string16>* browsers);
|
|
|
| // Returns the suffix this user's Chrome install is registered with.
|
| @@ -378,17 +376,8 @@ class ShellUtil {
|
| //
|
| // |chrome_exe| The path to the currently installed (or running) chrome.exe.
|
| static base::string16 GetCurrentInstallationSuffix(
|
| - BrowserDistribution* dist,
|
| const base::FilePath& chrome_exe);
|
|
|
| - // Returns the application name of the program under |dist|.
|
| - // This application name will be suffixed as is appropriate for the current
|
| - // install.
|
| - // This is the name that is registered with Default Programs on Windows and
|
| - // that should thus be used to "make chrome default" and such.
|
| - static base::string16 GetApplicationName(BrowserDistribution* dist,
|
| - const base::FilePath& chrome_exe);
|
| -
|
| // Returns the AppUserModelId. This identifier is unconditionally suffixed
|
| // with a unique id for this user on user-level installs (in contrast to other
|
| // registration entries which are suffixed as described in
|
|
|