cbuiv crostini: use new WidgetDelegate setters

This change also removes some now-unneeded instance vars.

Bug: 1075649
Change-Id: Ibac05c4b28f6f89f40bb153ba63bd3f46d075b00
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2252920
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#781506}

chrome/browser/ui/views/crostini/crostini_ansible_software_config_view.cc

@@ -60,21 +60,6 @@ bool CrostiniAnsibleSoftwareConfigView::Accept() {
   return true;
 }
 
-base::string16 CrostiniAnsibleSoftwareConfigView::GetWindowTitle() const {
-  switch (state_) {
-    case State::CONFIGURING:
-      return l10n_util::GetStringUTF16(
-          IDS_CROSTINI_ANSIBLE_SOFTWARE_CONFIG_LABEL);
-    case State::ERROR:
-      return l10n_util::GetStringUTF16(
-          IDS_CROSTINI_ANSIBLE_SOFTWARE_CONFIG_ERROR_LABEL);
-    case State::ERROR_OFFLINE:
-      return l10n_util::GetStringFUTF16(
-          IDS_CROSTINI_ANSIBLE_SOFTWARE_CONFIG_ERROR_OFFLINE_LABEL,
-          ui::GetChromeOSDeviceName());
-  }
-}
-
 base::string16 CrostiniAnsibleSoftwareConfigView::GetSubtextLabel() const {
   switch (state_) {
     case State::CONFIGURING:
@@ -142,27 +127,22 @@ CrostiniAnsibleSoftwareConfigView::CrostiniAnsibleSoftwareConfigView(
   set_margins(provider->GetDialogInsetsForContentType(
       views::DialogContentType::TEXT, views::DialogContentType::CONTROL));
 
-  subtext_label_ = new views::Label(
-      l10n_util::GetStringUTF16(IDS_CROSTINI_ANSIBLE_SOFTWARE_CONFIG_SUBTEXT));
-  subtext_label_->SetMultiLine(true);
-  subtext_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  AddChildView(subtext_label_);
+  auto subtext_label = std::make_unique<views::Label>();
+  subtext_label->SetMultiLine(true);
+  subtext_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  subtext_label_ = AddChildView(std::move(subtext_label));
 
   // Add infinite progress bar.
   // TODO(crbug.com/1000173): add progress reporting and display text above
   // progress bar indicating current process.
-  progress_bar_ = new views::ProgressBar();
-  progress_bar_->SetVisible(true);
+  auto progress_bar = std::make_unique<views::ProgressBar>();
   // Values outside the range [0,1] display an infinite loading animation.
-  progress_bar_->SetValue(-1);
-  AddChildView(progress_bar_);
+  progress_bar->SetValue(-1);
+  progress_bar_ = AddChildView(std::move(progress_bar));
 
   chrome::RecordDialogCreation(
       chrome::DialogIdentifier::CROSTINI_ANSIBLE_SOFTWARE_CONFIG);
-
-  // In the initial state (CONFIGURING), there are no buttons and hence no set
-  // labels.
-  SetButtons(ui::DIALOG_BUTTON_NONE);
+  OnStateChanged();
 }
 
 CrostiniAnsibleSoftwareConfigView::~CrostiniAnsibleSoftwareConfigView() {
@@ -170,7 +150,25 @@ CrostiniAnsibleSoftwareConfigView::~CrostiniAnsibleSoftwareConfigView() {
   g_crostini_ansible_software_configuration_view = nullptr;
 }
 
+// static
+base::string16 CrostiniAnsibleSoftwareConfigView::GetWindowTitleForState(
+    State state) {
+  switch (state) {
+    case State::CONFIGURING:
+      return l10n_util::GetStringUTF16(
+          IDS_CROSTINI_ANSIBLE_SOFTWARE_CONFIG_LABEL);
+    case State::ERROR:
+      return l10n_util::GetStringUTF16(
+          IDS_CROSTINI_ANSIBLE_SOFTWARE_CONFIG_ERROR_LABEL);
+    case State::ERROR_OFFLINE:
+      return l10n_util::GetStringFUTF16(
+          IDS_CROSTINI_ANSIBLE_SOFTWARE_CONFIG_ERROR_OFFLINE_LABEL,
+          ui::GetChromeOSDeviceName());
+  }
+}
+
 void CrostiniAnsibleSoftwareConfigView::OnStateChanged() {
+  SetTitle(GetWindowTitleForState(state_));
   progress_bar_->SetVisible(state_ == State::CONFIGURING);
   subtext_label_->SetText(GetSubtextLabel());
   SetButtons(state_ == State::CONFIGURING
@@ -185,6 +183,6 @@ void CrostiniAnsibleSoftwareConfigView::OnStateChanged() {
                      : l10n_util::GetStringUTF16(
                            IDS_CROSTINI_ANSIBLE_SOFTWARE_CONFIG_RETRY_BUTTON));
   DialogModelChanged();
-  GetWidget()->UpdateWindowTitle();
-  GetWidget()->SetSize(GetWidget()->non_client_view()->GetPreferredSize());
+  if (GetWidget())
+    GetWidget()->SetSize(GetWidget()->non_client_view()->GetPreferredSize());
 }

chrome/browser/ui/views/crostini/crostini_ansible_software_config_view.h

@@ -22,7 +22,6 @@ class CrostiniAnsibleSoftwareConfigView
  public:
   // views::DialogDelegateView:
   bool Accept() override;
-  base::string16 GetWindowTitle() const override;
   gfx::Size CalculatePreferredSize() const override;
 
   // crostini::AnsibleManagementService::Observer:
@@ -42,6 +41,8 @@ class CrostiniAnsibleSoftwareConfigView
     ERROR_OFFLINE,
   };
 
+  static base::string16 GetWindowTitleForState(State state);
+
   void OnStateChanged();
   base::string16 GetSubtextLabel() const;
 

chrome/browser/ui/views/crostini/crostini_force_close_view.cc

@@ -42,32 +42,17 @@ views::Widget* CrostiniForceCloseView::Show(
     gfx::NativeView closable_view,
     base::OnceClosure force_close_callback) {
   views::Widget* dialog_widget = views::DialogDelegate::CreateDialogWidget(
-      new CrostiniForceCloseView(app_name, std::move(force_close_callback)),
+      new CrostiniForceCloseView(base::UTF8ToUTF16(app_name),
+                                 std::move(force_close_callback)),
       closable_window, closable_view);
   dialog_widget->Show();
   return dialog_widget;
 }
 
-bool CrostiniForceCloseView::Accept() {
-  std::move(force_close_callback_).Run();
-  return true;
-}
-
 ui::ModalType CrostiniForceCloseView::GetModalType() const {
   return ui::ModalType::MODAL_TYPE_WINDOW;
 }
 
-bool CrostiniForceCloseView::ShouldShowCloseButton() const {
-  return false;
-}
-
-base::string16 CrostiniForceCloseView::GetWindowTitle() const {
-  return app_name_.empty()
-             ? l10n_util::GetStringUTF16(IDS_CROSTINI_FORCE_CLOSE_TITLE_UNKNOWN)
-             : l10n_util::GetStringFUTF16(IDS_CROSTINI_FORCE_CLOSE_TITLE_KNOWN,
-                                          app_name_);
-}
-
 gfx::Size CrostiniForceCloseView::CalculatePreferredSize() const {
   const int dialog_width = ChromeLayoutProvider::Get()->GetDistanceMetric(
                                DISTANCE_MODAL_DIALOG_PREFERRED_WIDTH) -
@@ -76,13 +61,18 @@ gfx::Size CrostiniForceCloseView::CalculatePreferredSize() const {
 }
 
 CrostiniForceCloseView::CrostiniForceCloseView(
-    const std::string& app_name,
-    base::OnceClosure force_close_callback)
-    : app_name_(base::UTF8ToUTF16(app_name)),
-      force_close_callback_(std::move(force_close_callback)) {
+    const base::string16& app_name,
+    base::OnceClosure force_close_callback) {
+  SetShowCloseButton(false);
+  SetTitle(
+      app_name.empty()
+          ? l10n_util::GetStringUTF16(IDS_CROSTINI_FORCE_CLOSE_TITLE_UNKNOWN)
+          : l10n_util::GetStringFUTF16(IDS_CROSTINI_FORCE_CLOSE_TITLE_KNOWN,
+                                       app_name));
   SetButtonLabel(
       ui::DIALOG_BUTTON_OK,
       l10n_util::GetStringUTF16(IDS_CROSTINI_FORCE_CLOSE_ACCEPT_BUTTON));
+  SetAcceptCallback(std::move(force_close_callback));
 
   views::LayoutProvider* provider = views::LayoutProvider::Get();
   SetLayoutManager(std::make_unique<views::BoxLayout>(
@@ -93,10 +83,10 @@ CrostiniForceCloseView::CrostiniForceCloseView(
       views::DialogContentType::TEXT, views::DialogContentType::TEXT));
 
   views::Label* message_label = new views::Label(
-      app_name_.empty()
+      app_name.empty()
           ? l10n_util::GetStringUTF16(IDS_CROSTINI_FORCE_CLOSE_BODY_UNKNOWN)
           : l10n_util::GetStringFUTF16(IDS_CROSTINI_FORCE_CLOSE_BODY_KNOWN,
-                                       app_name_));
+                                       app_name));
   message_label->SetMultiLine(true);
   message_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   AddChildView(message_label);

chrome/browser/ui/views/crostini/crostini_force_close_view.h

@@ -6,8 +6,13 @@
 #define CHROME_BROWSER_UI_VIEWS_CROSTINI_CROSTINI_FORCE_CLOSE_VIEW_H_
 
 #include "base/callback.h"
+#include "ui/base/ui_base_types.h"
+#include "ui/gfx/geometry/size.h"
+#include "ui/gfx/native_widget_types.h"
 #include "ui/views/bubble/bubble_dialog_delegate_view.h"
 
+#include <string>
+
 namespace views {
 class Widget;
 }
@@ -32,25 +37,15 @@ class CrostiniForceCloseView : public views::BubbleDialogDelegateView {
                              base::OnceClosure force_close_callback);
 
   // BubbleDialogDelegateView overrides.
-  bool Accept() override;
   ui::ModalType GetModalType() const override;
-  bool ShouldShowCloseButton() const override;
-  base::string16 GetWindowTitle() const override;
   gfx::Size CalculatePreferredSize() const override;
 
  private:
-  CrostiniForceCloseView(const std::string& app_name,
+  CrostiniForceCloseView(const base::string16& app_name,
                          base::OnceClosure force_close_callback);
 
   ~CrostiniForceCloseView() override;
 
-  // Then name of this application which we will display to the user. If we
-  // don't know the app's name, this will be the empty string.
-  base::string16 app_name_;
-
-  // The callback to invoke if the user chooses to force close.
-  base::OnceClosure force_close_callback_;
-
   DISALLOW_COPY_AND_ASSIGN(CrostiniForceCloseView);
 };
 

chrome/browser/ui/views/crostini/crostini_package_install_failure_view.cc

@@ -32,15 +32,6 @@ void CrostiniPackageInstallFailureView::Show(const std::string& error_message) {
       ->Show();
 }
 
-bool CrostiniPackageInstallFailureView::ShouldShowCloseButton() const {
-  return false;
-}
-
-base::string16 CrostiniPackageInstallFailureView::GetWindowTitle() const {
-  return l10n_util::GetStringUTF16(
-      IDS_CROSTINI_PACKAGE_INSTALL_FAILURE_VIEW_TITLE);
-}
-
 gfx::Size CrostiniPackageInstallFailureView::CalculatePreferredSize() const {
   const int dialog_width = ChromeLayoutProvider::Get()->GetDistanceMetric(
                                DISTANCE_MODAL_DIALOG_PREFERRED_WIDTH) -
@@ -50,6 +41,8 @@ gfx::Size CrostiniPackageInstallFailureView::CalculatePreferredSize() const {
 
 CrostiniPackageInstallFailureView::CrostiniPackageInstallFailureView(
     const std::string& error_message) {
+  SetShowCloseButton(false);
+  SetTitle(IDS_CROSTINI_PACKAGE_INSTALL_FAILURE_VIEW_TITLE);
   SetButtons(ui::DIALOG_BUTTON_OK);
   views::LayoutProvider* provider = views::LayoutProvider::Get();
   SetLayoutManager(std::make_unique<views::BoxLayout>(

chrome/browser/ui/views/crostini/crostini_package_install_failure_view.h

@@ -14,8 +14,6 @@ class CrostiniPackageInstallFailureView
   static void Show(const std::string& error_message);
 
   // BubbleDialogDelegateView overrides.
-  bool ShouldShowCloseButton() const override;
-  base::string16 GetWindowTitle() const override;
   gfx::Size CalculatePreferredSize() const override;
 
  private:

chrome/browser/ui/views/crostini/crostini_recovery_view.cc

@@ -60,14 +60,6 @@ bool CrostiniRecoveryView::Show(Profile* profile,
   return g_crostini_recovery_view->can_launch_apps_;
 }
 
-base::string16 CrostiniRecoveryView::GetWindowTitle() const {
-  return l10n_util::GetStringUTF16(IDS_CROSTINI_RECOVERY_TITLE);
-}
-
-bool CrostiniRecoveryView::ShouldShowCloseButton() const {
-  return false;
-}
-
 bool CrostiniRecoveryView::IsDialogButtonEnabled(
     ui::DialogButton button) const {
   // Buttons are disabled after Accept or Cancel have been clicked.
@@ -149,6 +141,8 @@ CrostiniRecoveryView::CrostiniRecoveryView(
   SetButtonLabel(
       ui::DIALOG_BUTTON_CANCEL,
       l10n_util::GetStringUTF16(IDS_CROSTINI_RECOVERY_TERMINAL_BUTTON));
+  SetShowCloseButton(false);
+  SetTitle(IDS_CROSTINI_RECOVERY_TITLE);
 
   views::LayoutProvider* provider = views::LayoutProvider::Get();
   SetLayoutManager(std::make_unique<views::BoxLayout>(

chrome/browser/ui/views/crostini/crostini_recovery_view.h

@@ -24,8 +24,6 @@ class CrostiniRecoveryView : public views::BubbleDialogDelegateView {
                    crostini::LaunchCrostiniAppCallback callback);
 
   // views::DialogDelegateView:
-  base::string16 GetWindowTitle() const override;
-  bool ShouldShowCloseButton() const override;
   gfx::Size CalculatePreferredSize() const override;
   bool Accept() override;
   bool Cancel() override;

chrome/browser/ui/views/crostini/crostini_uninstaller_view.cc

@@ -50,15 +50,6 @@ void CrostiniUninstallerView::Show(Profile* profile) {
   g_crostini_uninstaller_view->GetWidget()->Show();
 }
 
-base::string16 CrostiniUninstallerView::GetWindowTitle() const {
-  const base::string16 device_type = ui::GetChromeOSDeviceName();
-  return l10n_util::GetStringUTF16(IDS_CROSTINI_UNINSTALLER_TITLE);
-}
-
-bool CrostiniUninstallerView::ShouldShowCloseButton() const {
-  return false;
-}
-
 bool CrostiniUninstallerView::Accept() {
   state_ = State::UNINSTALLING;
   SetButtons(ui::DIALOG_BUTTON_NONE);
@@ -101,6 +92,8 @@ CrostiniUninstallerView* CrostiniUninstallerView::GetActiveViewForTesting() {
 
 CrostiniUninstallerView::CrostiniUninstallerView(Profile* profile)
     : profile_(profile) {
+  SetShowCloseButton(false);
+  SetTitle(IDS_CROSTINI_UNINSTALLER_TITLE);
   SetButtonLabel(
       ui::DIALOG_BUTTON_OK,
       l10n_util::GetStringUTF16(IDS_CROSTINI_UNINSTALLER_UNINSTALL_BUTTON));

chrome/browser/ui/views/crostini/crostini_uninstaller_view.h

@@ -34,8 +34,6 @@ class CrostiniUninstallerView : public views::BubbleDialogDelegateView {
   static void Show(Profile* profile);
 
   // views::DialogDelegateView:
-  base::string16 GetWindowTitle() const override;
-  bool ShouldShowCloseButton() const override;
   bool Accept() override;
   bool Cancel() override;
   gfx::Size CalculatePreferredSize() const override;

chrome/browser/ui/views/crostini/crostini_update_component_view.cc

@@ -46,14 +46,6 @@ void CrostiniUpdateComponentView::Show(Profile* profile) {
   g_crostini_upgrade_view->GetWidget()->Show();
 }
 
-base::string16 CrostiniUpdateComponentView::GetWindowTitle() const {
-  return l10n_util::GetStringUTF16(IDS_CROSTINI_TERMINA_UPDATE_REQUIRED);
-}
-
-bool CrostiniUpdateComponentView::ShouldShowCloseButton() const {
-  return false;
-}
-
 gfx::Size CrostiniUpdateComponentView::CalculatePreferredSize() const {
   const int dialog_width = ChromeLayoutProvider::Get()->GetDistanceMetric(
                                DISTANCE_STANDALONE_BUBBLE_PREFERRED_WIDTH) -
@@ -69,6 +61,8 @@ CrostiniUpdateComponentView::GetActiveViewForTesting() {
 
 CrostiniUpdateComponentView::CrostiniUpdateComponentView() {
   SetButtons(ui::DIALOG_BUTTON_OK);
+  SetShowCloseButton(false);
+  SetTitle(IDS_CROSTINI_TERMINA_UPDATE_REQUIRED);
 
   views::LayoutProvider* provider = views::LayoutProvider::Get();
   SetLayoutManager(std::make_unique<views::BoxLayout>(

chrome/browser/ui/views/crostini/crostini_update_component_view.h

@@ -20,8 +20,6 @@ class CrostiniUpdateComponentView : public views::BubbleDialogDelegateView {
   static void Show(Profile* profile);
 
   // views::DialogDelegateView:
-  base::string16 GetWindowTitle() const override;
-  bool ShouldShowCloseButton() const override;
   gfx::Size CalculatePreferredSize() const override;
 
   static CrostiniUpdateComponentView* GetActiveViewForTesting();

chrome/browser/ui/views/crostini/crostini_update_filesystem_view.cc

@@ -90,14 +90,6 @@ void CrostiniUpdateFilesystemView::Show(Profile* profile) {
   g_crostini_update_filesystem_view_dialog->GetWidget()->Show();
 }
 
-base::string16 CrostiniUpdateFilesystemView::GetWindowTitle() const {
-  return l10n_util::GetStringUTF16(IDS_CROSTINI_UPGRADING_LABEL);
-}
-
-bool CrostiniUpdateFilesystemView::ShouldShowCloseButton() const {
-  return false;
-}
-
 gfx::Size CrostiniUpdateFilesystemView::CalculatePreferredSize() const {
   const int dialog_width = ChromeLayoutProvider::Get()->GetDistanceMetric(
                                DISTANCE_STANDALONE_BUBBLE_PREFERRED_WIDTH) -
@@ -114,6 +106,8 @@ CrostiniUpdateFilesystemView::GetActiveViewForTesting() {
 CrostiniUpdateFilesystemView::CrostiniUpdateFilesystemView() {
   constexpr int kDialogSpacingVertical = 32;
 
+  SetShowCloseButton(false);
+  SetTitle(IDS_CROSTINI_UPGRADING_LABEL);
   SetButtons(ui::DIALOG_BUTTON_OK);
 
   views::LayoutProvider* provider = views::LayoutProvider::Get();

chrome/browser/ui/views/crostini/crostini_update_filesystem_view.h

@@ -20,8 +20,6 @@ class CrostiniUpdateFilesystemView : public views::BubbleDialogDelegateView {
   static void Show(Profile* profile);
 
   // views::DialogDelegateView:
-  base::string16 GetWindowTitle() const override;
-  bool ShouldShowCloseButton() const override;
   gfx::Size CalculatePreferredSize() const override;
 
   static CrostiniUpdateFilesystemView* GetActiveViewForTesting();