| Index: chrome/browser/shell_integration.cc
|
| diff --git a/chrome/browser/shell_integration.cc b/chrome/browser/shell_integration.cc
|
| index 6748679997286e38e9a46d279f187064e9dd7062..a30b9005c2889b05947341bb56d7e8eaee6ef70e 100644
|
| --- a/chrome/browser/shell_integration.cc
|
| +++ b/chrome/browser/shell_integration.cc
|
| @@ -18,7 +18,8 @@
|
|
|
| using content::BrowserThread;
|
|
|
| -bool ShellIntegration::CanSetAsDefaultProtocolClient() {
|
| +ShellIntegration::DefaultSettingsChangePermission
|
| + ShellIntegration::CanSetAsDefaultProtocolClient() {
|
| // Allowed as long as the browser can become the operating system default
|
| // browser.
|
| return CanSetAsDefaultBrowser();
|
| @@ -92,6 +93,13 @@ CommandLine ShellIntegration::CommandLineArgsForLauncher(
|
| return new_cmd_line;
|
| }
|
|
|
| +#if !defined(OS_WIN)
|
| +// static
|
| +bool ShellIntegration::StartSetAsDefaultBrowserInteractive() {
|
| + return false;
|
| +}
|
| +#endif
|
| +
|
| ///////////////////////////////////////////////////////////////////////////////
|
| // ShellIntegration::DefaultWebClientWorker
|
| //
|
|
|