diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-04 00:48:42 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-04 00:48:42 +0000 |
| commit | 53b41f0e7522dcccee24886e2661d0cfaf1b2d6c (patch) | |
| tree | 23b036c3b5ea10c5156b18e1203031e9ee1eddd7 /chrome/browser/views/first_run_customize_view.cc | |
| parent | d5ddf9a35100011523c9a83f5091fcb2160801b4 (diff) | |
| download | chromium_src-53b41f0e7522dcccee24886e2661d0cfaf1b2d6c.zip chromium_src-53b41f0e7522dcccee24886e2661d0cfaf1b2d6c.tar.gz chromium_src-53b41f0e7522dcccee24886e2661d0cfaf1b2d6c.tar.bz2 | |
Win: Grey out/remove default browser choices in side by side installs.
BUG=37125
TEST=run mini_installer.exe --chrome-sxs, should display message about being a secondary install instead of having a default browser checkbox. In SxS options it should display the same message and have the default browser button greyed out. Uninstall of SxS should not show default browser setting.
Review URL: http://codereview.chromium.org/661440
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40583 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/first_run_customize_view.cc')
| -rw-r--r-- | chrome/browser/views/first_run_customize_view.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/views/first_run_customize_view.cc b/chrome/browser/views/first_run_customize_view.cc index abc6f93..d2886ad 100644 --- a/chrome/browser/views/first_run_customize_view.cc +++ b/chrome/browser/views/first_run_customize_view.cc @@ -10,6 +10,7 @@ #include "chrome/browser/importer/importer.h" #include "chrome/browser/first_run.h" #include "chrome/browser/metrics/user_metrics.h" +#include "chrome/installer/util/browser_distribution.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" @@ -45,7 +46,8 @@ FirstRunCustomizeView::FirstRunCustomizeView(Profile* profile, // the customize view, so that the user selection isn't lost when you uncheck // and then open the Customize dialog. Therefore, we propagate the selection // status of the default browser here. - default_browser_->SetChecked(default_browser_checked); + if (default_browser_) + default_browser_->SetChecked(default_browser_checked); } FirstRunCustomizeView::~FirstRunCustomizeView() { @@ -209,7 +211,7 @@ bool FirstRunCustomizeView::Accept() { importer_host_->GetSourceProfileInfoAt(browser_selected).browser_type, GetImportItems(), window()->GetNativeWindow()); } - if (default_browser_->checked()) + if (default_browser_ && default_browser_->checked()) SetDefaultBrowser(); if (customize_observer_) |