Shared FirstRun dialog on Win & Linux

issue: brave/brave-browser#21804

Author: simonhong

app/brave_generated_resources.grd

@@ -1656,20 +1656,18 @@ Are you sure you want to do this?
       <message name="IDS_FIRSTRUN_DLG_COMPLETE_INSTALLATION_LABEL_BRAVE" desc="Label at top of Dialog noting what's going to happen">
         To ensure the best privacy online, consider setting Brave as the default browser on your computer. With Brave as default, any web link you click will open with Brave's privacy protections.
       </message>
-      <if expr="is_win">
-        <message name="IDS_FIRSTRUN_DLG_WIN_HEADER_TEXT" desc="Text for FirstRun dialog header">
-          Ready for the best privacy online?
-        </message>
-        <message name="IDS_FIRSTRUN_DLG_WIN_CONTENTS_TEXT" desc="Text for FirstRun dialog contents">
-          Set Brave as your default browser to get Brave's privacy protections on every web page you open.
-        </message>
-        <message name="IDS_FIRSTRUN_DLG_WIN_OK_BUTTON_LABEL" desc="Text for FirstRun dialog ok button">
-          Set Brave as default
-        </message>
-        <message name="IDS_FIRSTRUN_DLG_WIN_CANCEL_BUTTON_LABEL" desc="Text for FirstRun dialog cancel button">
-          Maybe later
-        </message>
-      </if>
+      <message name="IDS_FIRSTRUN_DLG_HEADER_TEXT" desc="Text for FirstRun dialog header">
+        Ready for the best privacy online?
+      </message>
+      <message name="IDS_FIRSTRUN_DLG_CONTENTS_TEXT" desc="Text for FirstRun dialog contents">
+        Set Brave as your default browser to get Brave's privacy protections on every web page you open.
+      </message>
+      <message name="IDS_FIRSTRUN_DLG_OK_BUTTON_LABEL" desc="Text for FirstRun dialog ok button">
+        Set Brave as default
+      </message>
+      <message name="IDS_FIRSTRUN_DLG_CANCEL_BUTTON_LABEL" desc="Text for FirstRun dialog cancel button">
+        Maybe later
+      </message>
       <message name="IDS_SETTINGS_WALLET_NETWORKS_ITEM" desc="The label for opening wallet networks list">
         Networks
       </message>

browser/ui/BUILD.gn

@@ -154,6 +154,8 @@ source_set("ui") {
       "views/bookmarks/bookmark_bar_instructions_view.h",
       "views/brave_default_browser_dialog_view.cc",
       "views/brave_default_browser_dialog_view.h",
+      "views/brave_first_run_dialog.cc",
+      "views/brave_first_run_dialog.h",
       "views/brave_layout_provider.cc",
       "views/brave_layout_provider.h",
       "views/crash_report_permission_ask_dialog_view.cc",
@@ -182,15 +184,6 @@ source_set("ui") {
       "views/web_discovery_dialog_view.h",
     ]
 
-    # Use different FirstRun dialog UI on Win.
-    # Upstream only includes it on mac/Linux.
-    if (is_win) {
-      sources += [
-        "views/first_run_dialog_win.cc",
-        "views/first_run_dialog_win.h",
-      ]
-    }
-
     if (use_aura) {
       sources += [
         "views/renderer_context_menu/brave_render_view_context_menu_views.cc",

browser/ui/views/first_run_dialog_win.cc renamed to browser/ui/views/brave_first_run_dialog.cc

@@ -3,17 +3,19 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "brave/browser/ui/views/first_run_dialog_win.h"
+#include "brave/browser/ui/views/brave_first_run_dialog.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/memory/scoped_refptr.h"
 #include "base/run_loop.h"
-#include "brave/browser/brave_shell_integration.h"
 #include "brave/grit/brave_generated_resources.h"
+#include "build/build_config.h"
 #include "chrome/browser/first_run/first_run.h"
+#include "chrome/browser/ui/ui_features.h"
+#include "chrome/grit/chromium_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/metadata/metadata_impl_macros.h"
 #include "ui/gfx/font.h"
@@ -22,31 +24,55 @@
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/window/dialog_delegate.h"
 
+#if BUILDFLAG(IS_WIN)
+#include "brave/browser/brave_shell_integration.h"
+#else
+#include "chrome/browser/shell_integration.h"
+#endif
+
 namespace first_run {
 
-void ShowFirstRunDialog(Profile* profile) {
+namespace {
+
+void ShowBraveFirstRunDialogViews(Profile* profile) {
   base::RunLoop run_loop(base::RunLoop::Type::kNestableTasksAllowed);
-  FirstRunDialogWin::Show(run_loop.QuitClosure());
+  BraveFirstRunDialog::Show(run_loop.QuitClosure());
   run_loop.Run();
 }
 
+}  // namespace
+
+void ShowFirstRunDialog(Profile* profile) {
+#if BUILDFLAG(IS_MAC)
+  if (base::FeatureList::IsEnabled(features::kViewsFirstRunDialog))
+    ShowFirstRunDialogViews(profile);
+  else
+    ShowFirstRunDialogCocoa(profile);
+#else
+  ShowBraveFirstRunDialogViews(profile);
+#endif
+}
+
 }  // namespace first_run
 
 // static
-void FirstRunDialogWin::Show(base::RepeatingClosure quit_runloop) {
-  FirstRunDialogWin* dialog = new FirstRunDialogWin(std::move(quit_runloop));
+void BraveFirstRunDialog::Show(base::RepeatingClosure quit_runloop) {
+  BraveFirstRunDialog* dialog =
+      new BraveFirstRunDialog(std::move(quit_runloop));
   views::DialogDelegate::CreateDialogWidget(dialog, NULL, NULL)->Show();
 }
 
-FirstRunDialogWin::FirstRunDialogWin(base::RepeatingClosure quit_runloop)
+BraveFirstRunDialog::BraveFirstRunDialog(base::RepeatingClosure quit_runloop)
     : quit_runloop_(quit_runloop) {
   set_should_ignore_snapping(true);
-  SetButtonLabel(
-      ui::DIALOG_BUTTON_OK,
-      l10n_util::GetStringUTF16(IDS_FIRSTRUN_DLG_WIN_OK_BUTTON_LABEL));
+#if BUILDFLAG(IS_LINUX)
+  SetTitle(IDS_FIRST_RUN_DIALOG_WINDOW_TITLE);
+#endif
+  SetButtonLabel(ui::DIALOG_BUTTON_OK,
+                 l10n_util::GetStringUTF16(IDS_FIRSTRUN_DLG_OK_BUTTON_LABEL));
   SetButtonLabel(
       ui::DIALOG_BUTTON_CANCEL,
-      l10n_util::GetStringUTF16(IDS_FIRSTRUN_DLG_WIN_CANCEL_BUTTON_LABEL));
+      l10n_util::GetStringUTF16(IDS_FIRSTRUN_DLG_CANCEL_BUTTON_LABEL));
   constexpr int kChildSpacing = 16;
   constexpr int kPadding = 24;
   constexpr int kTopPadding = 20;
@@ -65,8 +91,7 @@ FirstRunDialogWin::FirstRunDialogWin(base::RepeatingClosure quit_runloop)
           .DeriveWithSizeDelta(size_diff)
           .DeriveWithWeight(gfx::Font::Weight::SEMIBOLD)};
   auto* header_label = AddChildView(std::make_unique<views::Label>(
-      l10n_util::GetStringUTF16(IDS_FIRSTRUN_DLG_WIN_HEADER_TEXT),
-      header_font));
+      l10n_util::GetStringUTF16(IDS_FIRSTRUN_DLG_HEADER_TEXT), header_font));
   header_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
 
   constexpr int kContentFontSize = 15;
@@ -77,35 +102,39 @@ FirstRunDialogWin::FirstRunDialogWin(base::RepeatingClosure quit_runloop)
           .DeriveWithSizeDelta(size_diff)
           .DeriveWithWeight(gfx::Font::Weight::NORMAL)};
   auto* contents_label = AddChildView(std::make_unique<views::Label>(
-      l10n_util::GetStringUTF16(IDS_FIRSTRUN_DLG_WIN_CONTENTS_TEXT),
+      l10n_util::GetStringUTF16(IDS_FIRSTRUN_DLG_CONTENTS_TEXT),
       contents_font));
   contents_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   contents_label->SetMultiLine(true);
   constexpr int kMaxWidth = 350;
   contents_label->SetMaximumWidth(kMaxWidth);
 }
 
-FirstRunDialogWin::~FirstRunDialogWin() = default;
+BraveFirstRunDialog::~BraveFirstRunDialog() = default;
 
-void FirstRunDialogWin::Done() {
+void BraveFirstRunDialog::Done() {
   CHECK(!quit_runloop_.is_null());
   quit_runloop_.Run();
 }
 
-bool FirstRunDialogWin::Accept() {
+bool BraveFirstRunDialog::Accept() {
   GetWidget()->Hide();
 
+#if BUILDFLAG(IS_WIN)
   base::MakeRefCounted<shell_integration::BraveDefaultBrowserWorker>()
       ->StartSetAsDefault(base::NullCallback());
+#else
+  shell_integration::SetAsDefaultBrowser();
+#endif
 
   Done();
   return true;
 }
 
-void FirstRunDialogWin::WindowClosing() {
+void BraveFirstRunDialog::WindowClosing() {
   first_run::SetShouldShowWelcomePage();
   Done();
 }
 
-BEGIN_METADATA(FirstRunDialogWin, views::DialogDelegateView)
+BEGIN_METADATA(BraveFirstRunDialog, views::DialogDelegateView)
 END_METADATA

browser/ui/views/first_run_dialog_win.h renamed to browser/ui/views/brave_first_run_dialog.h

@@ -3,25 +3,25 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef BRAVE_BROWSER_UI_VIEWS_FIRST_RUN_DIALOG_WIN_H_
-#define BRAVE_BROWSER_UI_VIEWS_FIRST_RUN_DIALOG_WIN_H_
+#ifndef BRAVE_BROWSER_UI_VIEWS_BRAVE_FIRST_RUN_DIALOG_H_
+#define BRAVE_BROWSER_UI_VIEWS_BRAVE_FIRST_RUN_DIALOG_H_
 
 #include "base/callback.h"
 #include "ui/base/metadata/metadata_header_macros.h"
 #include "ui/views/window/dialog_delegate.h"
 
-class FirstRunDialogWin : public views::DialogDelegateView {
+class BraveFirstRunDialog : public views::DialogDelegateView {
  public:
-  METADATA_HEADER(FirstRunDialogWin);
+  METADATA_HEADER(BraveFirstRunDialog);
 
-  FirstRunDialogWin(const FirstRunDialogWin&) = delete;
-  FirstRunDialogWin& operator=(const FirstRunDialogWin&) = delete;
+  BraveFirstRunDialog(const BraveFirstRunDialog&) = delete;
+  BraveFirstRunDialog& operator=(const BraveFirstRunDialog&) = delete;
 
   static void Show(base::RepeatingClosure quit_runloop);
 
  private:
-  explicit FirstRunDialogWin(base::RepeatingClosure quit_runloop);
-  ~FirstRunDialogWin() override;
+  explicit BraveFirstRunDialog(base::RepeatingClosure quit_runloop);
+  ~BraveFirstRunDialog() override;
 
   // This terminates the nested message-loop.
   void Done();
@@ -35,4 +35,4 @@ class FirstRunDialogWin : public views::DialogDelegateView {
   base::RepeatingClosure quit_runloop_;
 };
 
-#endif  // BRAVE_BROWSER_UI_VIEWS_FIRST_RUN_DIALOG_WIN_H_
+#endif  // BRAVE_BROWSER_UI_VIEWS_BRAVE_FIRST_RUN_DIALOG_H_

chromium_src/chrome/browser/ui/views/first_run_dialog.cc

@@ -3,131 +3,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "chrome/browser/ui/views/first_run_dialog.h"
+// We use our own FirstRun dialog on Windows/Linux.
+// ShowFirstRunDialog() is re-defined at brave_first_run_dialog.cc.
+#define ShowFirstRunDialog ShowFirstRunDialog_UnUsed
 
-#include <string>
+#include "src/chrome/browser/ui/views/first_run_dialog.cc"
 
-#include "base/bind.h"
-#include "base/run_loop.h"
-#include "brave/grit/brave_generated_resources.h"
-#include "build/build_config.h"
-#include "chrome/browser/first_run/first_run.h"
-#include "chrome/browser/first_run/first_run_dialog.h"
-#include "chrome/browser/platform_util.h"
-#include "chrome/browser/shell_integration.h"
-#include "chrome/browser/ui/browser_dialogs.h"
-#include "chrome/browser/ui/ui_features.h"
-#include "chrome/common/url_constants.h"
-#include "chrome/grit/chromium_strings.h"
-#include "chrome/grit/generated_resources.h"
-#include "components/strings/grit/components_strings.h"
-#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/metadata/metadata_impl_macros.h"
-#include "ui/views/border.h"
-#include "ui/views/controls/button/checkbox.h"
-#include "ui/views/controls/link.h"
-#include "ui/views/layout/box_layout.h"
-#include "ui/views/widget/widget.h"
-#include "ui/views/window/dialog_delegate.h"
-
-namespace first_run {
-
-void ShowFirstRunDialog(Profile* profile) {
-#if BUILDFLAG(IS_MAC)
-  if (base::FeatureList::IsEnabled(features::kViewsFirstRunDialog))
-    ShowFirstRunDialogViews(profile);
-  else
-    ShowFirstRunDialogCocoa(profile);
-#else
-  ShowFirstRunDialogViews(profile);
-#endif
-}
-
-void ShowFirstRunDialogViews(Profile* profile) {
-  base::RunLoop run_loop(base::RunLoop::Type::kNestableTasksAllowed);
-  FirstRunDialog::Show(
-      base::BindRepeating(&platform_util::OpenExternal,
-                          base::Unretained(profile),
-                          GURL(chrome::kLearnMoreReportingURL)),
-      run_loop.QuitClosure());
-  run_loop.Run();
-}
-
-}  // namespace first_run
-
-// static
-void FirstRunDialog::Show(base::RepeatingClosure learn_more_callback,
-                          base::RepeatingClosure quit_runloop) {
-  FirstRunDialog* dialog = new FirstRunDialog(std::move(learn_more_callback),
-                                              std::move(quit_runloop));
-  views::DialogDelegate::CreateDialogWidget(dialog, NULL, NULL)->Show();
-}
-
-FirstRunDialog::FirstRunDialog(base::RepeatingClosure learn_more_callback,
-                               base::RepeatingClosure quit_runloop)
-    : quit_runloop_(quit_runloop) {
-  // ALLOW_UNUSED_LOCAL has been removed and [[maybe_unused]] can only be used
-  // alongside declarations, so reference it here just to silence the compiler's
-  // -Wunused errors without having to override the header file.
-  if (report_crashes_)
-    report_crashes_->GetChecked();
-
-  SetTitle(l10n_util::GetStringUTF16(IDS_FIRST_RUN_DIALOG_WINDOW_TITLE));
-  SetButtons(ui::DIALOG_BUTTON_OK);
-  SetExtraView(
-      std::make_unique<views::Link>(l10n_util::GetStringUTF16(IDS_LEARN_MORE)))
-      ->SetCallback(std::move(learn_more_callback));
-
-  constexpr int kChildSpacing = 16;
-  constexpr int kPadding = 24;
-
-  SetLayoutManager(std::make_unique<views::BoxLayout>(
-      views::BoxLayout::Orientation::kVertical,
-      gfx::Insets(kPadding, kPadding, kPadding, kPadding), kChildSpacing));
-
-  constexpr int kFontSize = 15;
-  int size_diff = kFontSize - views::Label::GetDefaultFontList().GetFontSize();
-  views::Label::CustomFont contents_font = {
-      views::Label::GetDefaultFontList()
-          .DeriveWithSizeDelta(size_diff)
-          .DeriveWithWeight(gfx::Font::Weight::NORMAL)};
-  auto* contents_label = AddChildView(std::make_unique<views::Label>(
-      l10n_util::GetStringUTF16(
-          IDS_FIRSTRUN_DLG_COMPLETE_INSTALLATION_LABEL_BRAVE),
-      contents_font));
-  contents_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  contents_label->SetMultiLine(true);
-  constexpr int kMaxWidth = 450;
-  contents_label->SetMaximumWidth(kMaxWidth);
-
-  make_default_ = AddChildView(std::make_unique<views::Checkbox>(
-      l10n_util::GetStringUTF16(IDS_FR_CUSTOMIZE_DEFAULT_BROWSER_BRAVE)));
-  make_default_->SetChecked(true);
-
-  chrome::RecordDialogCreation(chrome::DialogIdentifier::FIRST_RUN_DIALOG);
-}
-
-FirstRunDialog::~FirstRunDialog() = default;
-
-void FirstRunDialog::Done() {
-  CHECK(!quit_runloop_.is_null());
-  quit_runloop_.Run();
-}
-
-bool FirstRunDialog::Accept() {
-  GetWidget()->Hide();
-
-  if (make_default_->GetChecked())
-    shell_integration::SetAsDefaultBrowser();
-
-  Done();
-  return true;
-}
-
-void FirstRunDialog::WindowClosing() {
-  first_run::SetShouldShowWelcomePage();
-  Done();
-}
-
-BEGIN_METADATA(FirstRunDialog, views::DialogDelegateView)
-END_METADATA
+#undef ShowFirstRunDialog