Fixes the interactive default browser UX for policy setting

chrome/browser/ui/webui/set_as_default_browser_ui.cc

 // Copyright (c) 2012 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/ui/webui/set_as_default_browser_ui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 91 matching lines @@
       const base::WeakPtr<ResponseDelegate>& response_delegate);
   ~SetAsDefaultBrowserHandler() override;
 
   // WebUIMessageHandler implementation.
   void RegisterMessages() override;
 
   // shell_integration::DefaultWebClientObserver implementation.
   void SetDefaultWebClientUIState(
       shell_integration::DefaultWebClientUIState state) override;
   void OnSetAsDefaultConcluded(bool close_chrome) override;
-  bool IsInteractiveSetDefaultPermitted() override;
 
  private:
   // Handler for the 'Next' (or 'make Chrome the Metro browser') button.
   void HandleLaunchSetDefaultBrowserFlow(const base::ListValue* args);
 
   // Close this web ui.
   void ConcludeInteraction(MakeChromeDefaultResult interaction_result);
 
   scoped_refptr<shell_integration::DefaultBrowserWorker>
       default_browser_worker_;
   bool set_default_returned_;
   bool set_default_result_;
   base::WeakPtr<ResponseDelegate> response_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(SetAsDefaultBrowserHandler);
 };
 
 SetAsDefaultBrowserHandler::SetAsDefaultBrowserHandler(
     const base::WeakPtr<ResponseDelegate>& response_delegate)
-    : default_browser_worker_(
-          new shell_integration::DefaultBrowserWorker(this)),
+    : default_browser_worker_(new shell_integration::DefaultBrowserWorker(
+          this,
+          /*delete_observer=*/false)),

[Nico, 2016/02/10 17:33:58]

ditto

[Patrick Monette, 2016/02/10 20:44:42]

Done.

       set_default_returned_(false),
       set_default_result_(false),
       response_delegate_(response_delegate) {}
 
 SetAsDefaultBrowserHandler::~SetAsDefaultBrowserHandler() {
   default_browser_worker_->ObserverDestroyed();
 }
 
 void SetAsDefaultBrowserHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback(
@@ skipping 20 matching lines @@
 
   // Otherwise, keep the dialog open since the user probably didn't make a
   // choice.
 }
 
 void SetAsDefaultBrowserHandler::OnSetAsDefaultConcluded(bool call_result) {
   set_default_returned_ = true;
   set_default_result_ = call_result;
 }
 
-bool SetAsDefaultBrowserHandler::IsInteractiveSetDefaultPermitted() {
-  return true;
-}
-
 void SetAsDefaultBrowserHandler::HandleLaunchSetDefaultBrowserFlow(
     const base::ListValue* args) {
   set_default_returned_ = false;
   set_default_result_ = false;
   default_browser_worker_->StartSetAsDefault();
 }
 
 void SetAsDefaultBrowserHandler::ConcludeInteraction(
     MakeChromeDefaultResult interaction_result) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ skipping 177 matching lines @@
       Profile::FromWebUI(web_ui), CreateSetAsDefaultBrowserUIHTMLSource());
 }
 
 // static
 void SetAsDefaultBrowserUI::Show(Profile* profile, Browser* browser) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   SetAsDefaultBrowserDialogImpl* dialog =
       new SetAsDefaultBrowserDialogImpl(profile, browser);
   dialog->ShowDialog();
 }