Merge 75401 - Fix a regression when switching the options pane to use Dom UI:...

chrome/browser/dom_ui/options/browser_options_handler.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/dom_ui/options/browser_options_handler.h"
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "base/singleton.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/custom_home_pages_table_model.h"
 #include "chrome/browser/dom_ui/dom_ui_favicon_source.h"
 #include "chrome/browser/dom_ui/options/dom_options_util.h"
 #include "chrome/browser/dom_ui/options/options_managed_banner_handler.h"
 #include "chrome/browser/instant/instant_confirm_dialog.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/net/url_fixer_upper.h"
+#include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/ui/options/options_window.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 157 matching lines @@
 
 void BrowserOptionsHandler::BecomeDefaultBrowser(const ListValue* args) {
   UserMetricsRecordAction(UserMetricsAction("Options_SetAsDefaultBrowser"));
 #if defined(OS_MACOSX)
   if (ShellIntegration::SetAsDefaultBrowser())
     UpdateDefaultBrowserState();
 #else
   default_browser_worker_->StartSetAsDefaultBrowser();
   // Callback takes care of updating UI.
 #endif
+
+  // If the user attempted to make Chrome the default browser, then he/she
+  // arguably wants to be notified when that changes.
+  PrefService* prefs = web_ui_->GetProfile()->GetPrefs();
+  prefs->SetBoolean(prefs::kCheckDefaultBrowser, true);
 }
 
 int BrowserOptionsHandler::StatusStringIdForState(
     ShellIntegration::DefaultBrowserState state) {
   if (state == ShellIntegration::IS_DEFAULT_BROWSER)
     return IDS_OPTIONS_DEFAULTBROWSER_DEFAULT;
   if (state == ShellIntegration::NOT_DEFAULT_BROWSER)
     return IDS_OPTIONS_DEFAULTBROWSER_NOTDEFAULT;
   return IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN;
 }
@@ skipping 194 matching lines @@
 }
 
 void BrowserOptionsHandler::SaveStartupPagesPref() {
   PrefService* prefs = dom_ui_->GetProfile()->GetPrefs();
 
   SessionStartupPref pref = SessionStartupPref::GetStartupPref(prefs);
   pref.urls = startup_custom_pages_table_model_->GetURLs();
 
   SessionStartupPref::SetStartupPref(prefs, pref);
 }