[MD User Menu] New way to handle supervised user auth error

chrome/browser/ui/views/profiles/profile_chooser_view.cc

 // Copyright 2014 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/views/profiles/profile_chooser_view.h"
 
 #include "base/macros.h"
 #include "base/metrics/user_metrics.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 1480 matching lines @@
   sync_ui_util::AvatarSyncErrorType error =
       sync_ui_util::GetMessagesForAvatarSyncError(
           browser_->profile(), &content_string_id, &button_string_id);
   switch (error) {
     case sync_ui_util::MANAGED_USER_UNRECOVERABLE_ERROR:
       button_out = &sync_error_signout_button_;
       break;
     case sync_ui_util::UNRECOVERABLE_ERROR:
       button_out = &sync_error_signin_again_button_;
       break;
+    case sync_ui_util::SUPERVISED_USER_AUTH_ERROR:
+      *button_out = nullptr;
+      break;
     case sync_ui_util::AUTH_ERROR:
       button_out = &sync_error_signin_button_;
       break;
     case sync_ui_util::UPGRADE_CLIENT_ERROR:
       button_out = &sync_error_upgrade_button_;
       break;
     case sync_ui_util::PASSPHRASE_ERROR:
       button_out = &sync_error_passphrase_button_;
       break;
     case sync_ui_util::NO_SYNC_ERROR:
       return nullptr;
     default:
       NOTREACHED();
   }
-  return CreateSyncErrorView(content_string_id, button_string_id, button_out);
-}
 
-views::View* ProfileChooserView::CreateSyncErrorView(
-    const int content_string_id,
-    const int button_string_id,
-    views::LabelButton** button_out) {
   // Sets an overall horizontal layout.
   views::View* view = new views::View();
   views::BoxLayout* layout = new views::BoxLayout(
       views::BoxLayout::kHorizontal, kMaterialMenuEdgeMargin,
       kMaterialMenuEdgeMargin, views::kUnrelatedControlHorizontalSpacing);
   layout->set_cross_axis_alignment(
       views::BoxLayout::CROSS_AXIS_ALIGNMENT_START);
   view->SetLayoutManager(layout);
 
   // Adds the sync problem icon.
@@ skipping 18 matching lines @@
   title_label->SetEnabledColor(gfx::kGoogleRed700);
   vertical_view->AddChildView(title_label);
 
   // Adds body content.
   views::Label* content_label =
       new views::Label(l10n_util::GetStringUTF16(content_string_id));
   content_label->SetMultiLine(true);
   content_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   vertical_view->AddChildView(content_label);
 
-  // Adds a padding row between error title/content and the button.
-  SizedContainer* padding =
-      new SizedContainer(gfx::Size(0, views::kRelatedControlVerticalSpacing));
-  vertical_view->AddChildView(padding);
+  // Adds an action button if an action exists.
+  if (button_string_id) {
+    DCHECK(button_out);
+    // Adds a padding row between error title/content and the button.
+    SizedContainer* padding =
+        new SizedContainer(gfx::Size(0, views::kRelatedControlVerticalSpacing));
+    vertical_view->AddChildView(padding);
 
-  // Adds an action button.
-  *button_out = views::MdTextButton::CreateSecondaryUiBlueButton(
-      this, l10n_util::GetStringUTF16(button_string_id));
-  vertical_view->AddChildView(*button_out);
+    *button_out = views::MdTextButton::CreateSecondaryUiBlueButton(
+        this, l10n_util::GetStringUTF16(button_string_id));
+    vertical_view->AddChildView(*button_out);
+    view->SetBorder(views::Border::CreateEmptyBorder(
+      0, 0, views::kRelatedControlSmallVerticalSpacing, 0));
+  } else {
+    *button_out = nullptr;

[sky, 2016/08/23 13:20:39]

The reason I suggested setting *button_to null here previously is to ensure the
value is always set. Now that there is one function it's clear you don't need to
always set button_out as it's no longer a parameter to the function and
expectations are clearer. In other words you can remove this now.

[Jane, 2016/08/23 15:04:40]

Done. I see, thanks!
(I actually realized that setting *button_out = nullptr would cause a segfault,
because button_out needs to be initialized before *button_out can be set, but
then if button_out initializes to be nullptr, then setting *button_out would
cause a segfault. Thus, I changed L1502 in the switch case to be simply
button_out = nullptr. Let me know if you think there is a better way. Sorry I
didn't test last night.)

+  }
 
   view->AddChildView(vertical_view);
-  view->SetBorder(views::Border::CreateEmptyBorder(
-      0, 0, views::kRelatedControlSmallVerticalSpacing, 0));
-
   return view;
 }
 
 views::View* ProfileChooserView::CreateCurrentProfileView(
     const AvatarMenu::Item& avatar_item,
     bool is_guest) {
   views::View* view = new views::View();
   int column_width = GetFixedMenuWidth() - 2 * views::kButtonHEdgeMarginNew;
   views::GridLayout* layout = CreateSingleColumnLayout(view, column_width);
   layout->SetInsets(views::kButtonVEdgeMarginNew,
@@ skipping 719 matching lines @@
       IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) !=
           IncognitoModePrefs::DISABLED;
   return incognito_available && !browser_->profile()->IsGuestSession();
 }
 
 void ProfileChooserView::PostActionPerformed(
     ProfileMetrics::ProfileDesktopMenu action_performed) {
   ProfileMetrics::LogProfileDesktopMenu(action_performed, gaia_service_type_);
   gaia_service_type_ = signin::GAIA_SERVICE_TYPE_NONE;
 }