diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-24 07:13:39 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-24 07:13:39 +0000 |
| commit | 89a6ca105dd5a9a9a24f9a46fdad0fd0755f77dd (patch) | |
| tree | 9d9b17eeb219d9f5ae94a6834f450300f2878878 /chrome/installer/util/shell_util.cc | |
| parent | 186f096098ec9b599d84ea38b6eda11fa1082107 (diff) | |
| download | chromium_src-89a6ca105dd5a9a9a24f9a46fdad0fd0755f77dd.zip chromium_src-89a6ca105dd5a9a9a24f9a46fdad0fd0755f77dd.tar.gz chromium_src-89a6ca105dd5a9a9a24f9a46fdad0fd0755f77dd.tar.bz2 | |
Fix GCF crash on Windows 8.
ShellUtil::GetChromeDefaultState now returns NOT_DEFAULT if the
distribution doesn't support being made the default browser.
BUG=296965
TEST=Navigate to any page that uses GCF.
R=robertshield@chromium.org
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/24323004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224938 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util/shell_util.cc')
| -rw-r--r-- | chrome/installer/util/shell_util.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc index c747547..d636414 100644 --- a/chrome/installer/util/shell_util.cc +++ b/chrome/installer/util/shell_util.cc @@ -1696,6 +1696,8 @@ string16 ShellUtil::BuildAppModelId( } ShellUtil::DefaultState ShellUtil::GetChromeDefaultState() { + if (!BrowserDistribution::GetDistribution()->CanSetAsDefault()) + return NOT_DEFAULT; // When we check for default browser we don't necessarily want to count file // type handlers and icons as having changed the default browser status, // since the user may have changed their shell settings to cause HTML files @@ -1711,6 +1713,8 @@ ShellUtil::DefaultState ShellUtil::GetChromeDefaultState() { ShellUtil::DefaultState ShellUtil::GetChromeDefaultProtocolClientState( const string16& protocol) { + if (!BrowserDistribution::GetDistribution()->CanSetAsDefault()) + return NOT_DEFAULT; if (protocol.empty()) return UNKNOWN_DEFAULT; |