Introduce a type of View background that stays in sync with its host

ash/system/user/user_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 "ash/system/user/user_view.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "ash/multi_profile_uma.h"
@@ skipping 18 matching lines @@
 #include "ash/system/user/user_card_view.h"
 #include "ash/wm_window.h"
 #include "base/memory/ptr_util.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user_info.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/paint_vector_icon.h"
+#include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/painter.h"
 
 namespace ash {
 namespace tray {
 
 namespace {
@@ skipping 16 matching lines @@
   controller->SwitchActiveUser(
       controller->GetUserSession(user_index)->account_id);
 }
 
 bool IsMultiProfileSupportedAndUserActive() {
   return Shell::Get()->shell_delegate()->IsMultiProfilesEnabled() &&
          !Shell::Get()->session_controller()->IsUserSessionBlocked();
 }
 
 // Creates the view shown in the user switcher popup ("AddUserMenuOption").
-views::View* CreateAddUserView(AddUserSessionPolicy policy,
-                               views::ButtonListener* listener) {
+views::View* CreateAddUserView(AddUserSessionPolicy policy) {
   auto* view = new views::View;
   const int icon_padding = (kMenuButtonSize - kMenuIconSize) / 2;
   auto* layout =
       new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0,
                            kTrayPopupLabelHorizontalPadding + icon_padding);
   layout->set_minimum_cross_axis_size(kTrayPopupItemMinHeight);
   view->SetLayoutManager(layout);
-  view->set_background(
-      views::Background::CreateSolidBackground(kBackgroundColor));
+  view->set_background(views::Background::CreateThemedSolidBackground(
+      view, ui::NativeTheme::kColorId_BubbleBackground));
 
   int message_id = 0;
   switch (policy) {
     case AddUserSessionPolicy::ALLOWED: {
       message_id = IDS_ASH_STATUS_TRAY_SIGN_IN_ANOTHER_ACCOUNT;
 
       auto* icon = new views::ImageView();
       icon->SetImage(
           gfx::CreateVectorIcon(kSystemMenuNewUserIcon, kMenuIconColor));
       view->AddChildView(icon);
@@ skipping 20 matching lines @@
   if (policy != AddUserSessionPolicy::ALLOWED) {
     label_style.set_font_style(TrayPopupItemStyle::FontStyle::CAPTION);
     label_style.set_color_style(TrayPopupItemStyle::ColorStyle::INACTIVE);
     vertical_padding += kMenuSeparatorVerticalPadding;
   }
   label_style.SetupLabel(command_label);
   view->AddChildView(command_label);
   view->SetBorder(views::CreateEmptyBorder(vertical_padding, icon_padding,
                                            vertical_padding,
                                            kTrayPopupLabelHorizontalPadding));
-  if (policy == AddUserSessionPolicy::ALLOWED) {
-    auto* button =
-        new ButtonFromView(view, listener, TrayPopupInkDropStyle::INSET_BOUNDS);
-    button->SetAccessibleName(
-        l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SIGN_IN_ANOTHER_ACCOUNT));
-    return button;
-  }
 
   return view;
 }
 
 class UserViewMouseWatcherHost : public views::MouseWatcherHost {
  public:
   explicit UserViewMouseWatcherHost(const gfx::Rect& screen_area)
       : screen_area_(screen_area) {}
   ~UserViewMouseWatcherHost() override {}
 
@@ skipping 214 matching lines @@
 
   // Position the widget on top of the user card view (which is still in the
   // system menu). The top half of the widget will be transparent to allow
   // the active user to show through.
   gfx::Rect bounds = user_card_view_->GetBoundsInScreen();
   bounds.set_width(bounds.width() + kSeparatorWidth);
   int row_height = bounds.height();
 
   views::View* container = new AddUserWidgetContents(
       base::Bind(&UserView::RemoveAddUserMenuOption, base::Unretained(this)));
+  views::View* add_user_view = CreateAddUserView(add_user_policy);
+  const SkColor bg_color = add_user_view->background()->get_color();
   container->SetBorder(views::CreatePaddedBorder(
-      views::CreateSolidSidedBorder(0, 0, 0, kSeparatorWidth, kBackgroundColor),
+      views::CreateSolidSidedBorder(0, 0, 0, kSeparatorWidth, bg_color),
       gfx::Insets(row_height, 0, 0, 0)));
   views::View* add_user_padding = new views::View();
   add_user_padding->SetBorder(views::CreateSolidSidedBorder(
-      kMenuSeparatorVerticalPadding, 0, 0, 0, kBackgroundColor));
-  views::View* add_user_view = CreateAddUserView(add_user_policy, this);
-  add_user_padding->AddChildView(add_user_view);
+      kMenuSeparatorVerticalPadding, 0, 0, 0, bg_color));
+  if (add_user_enabled_) {
+    auto* button = new ButtonFromView(add_user_view, this,
+                                      TrayPopupInkDropStyle::INSET_BOUNDS);
+    button->SetAccessibleName(
+        l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SIGN_IN_ANOTHER_ACCOUNT));
+    add_user_padding->AddChildView(button);

[Evan Stade, 2017/04/19 18:49:07]

oops, this will break the button pressed handler. note to self: fix before
landing.

+  } else {
+    add_user_padding->AddChildView(add_user_view);
+  }
   add_user_padding->SetLayoutManager(new views::FillLayout());
   container->AddChildView(add_user_padding);
   container->SetLayoutManager(new views::FillLayout());
   add_menu_option_->SetContentsView(container);
 
   bounds.set_height(container->GetPreferredSize().height());
   add_menu_option_->SetBounds(bounds);
 
   // Show the content.
   add_menu_option_->SetAlwaysOnTop(true);
@@ skipping 11 matching lines @@
     return;
   focus_manager_->RemoveFocusChangeListener(this);
   focus_manager_ = nullptr;
   if (user_card_view_->GetFocusManager())
     user_card_view_->GetFocusManager()->ClearFocus();
   add_menu_option_.reset();
 }
 
 }  // namespace tray
 }  // namespace ash