Rename user_menu_ to menu_ in LoginUserView.

As the comment in login_user_view.h by jdufault@, rename user_menu_ to menu_.

Change-Id: I2658041c0210acc1d41f02790f7d3e7586c58c3a
Reviewed-on: https://chromium-review.googlesource.com/1171976Reviewed-by: Jacob Dufault <jdufault@chromium.org>
Commit-Queue: Zhuoyu Qian <zhuoyu.qian@samsung.com>
Cr-Commit-Position: refs/heads/master@{#582797}

ash/login/ui/login_user_view.cc

@@ -322,7 +322,7 @@ views::View* LoginUserView::TestApi::dropdown() const {
 }
 
 LoginBubble* LoginUserView::TestApi::menu() const {
-  return view_->user_menu_.get();
+  return view_->menu_.get();
 }
 
 bool LoginUserView::TestApi::is_opaque() const {
@@ -414,7 +414,7 @@ LoginUserView::LoginUserView(
 
   hover_notifier_ = std::make_unique<HoverNotifier>(
       this, base::Bind(&LoginUserView::OnHover, base::Unretained(this)));
-  user_menu_ = std::make_unique<LoginBubble>();
+  menu_ = std::make_unique<LoginBubble>();
 }
 
 LoginUserView::~LoginUserView() = default;
@@ -519,8 +519,8 @@ void LoginUserView::ButtonPressed(views::Button* sender,
   // Handle click on the dropdown arrow.
   if (sender == dropdown_) {
     DCHECK(dropdown_);
-    if (!user_menu_->IsVisible()) {
-      user_menu_->ShowUserMenu(
+    if (!menu_->IsVisible()) {
+      menu_->ShowUserMenu(
           base::UTF8ToUTF16(current_user_->basic_user_info->display_name),
           base::UTF8ToUTF16(current_user_->basic_user_info->display_email),
           current_user_->basic_user_info->type, current_user_->is_device_owner,
@@ -528,7 +528,7 @@ void LoginUserView::ButtonPressed(views::Button* sender,
           current_user_->can_remove /*show_remove_user*/,
           on_remove_warning_shown_, on_remove_);
     } else {
-      user_menu_->Close();
+      menu_->Close();
     }
 
     return;

ash/login/ui/login_user_view.h

@@ -117,8 +117,8 @@ class ASH_EXPORT LoginUserView : public views::View,
   UserLabel* user_label_ = nullptr;
   LoginButton* dropdown_ = nullptr;
   TapButton* tap_button_ = nullptr;
-  // TODO(jdufault): Rename user_menu_ to menu_ or popup_menu_.
-  std::unique_ptr<LoginBubble> user_menu_;
+
+  std::unique_ptr<LoginBubble> menu_;
 
   // Show the domain information for public account user.
   UserDomainInfoView* user_domain_ = nullptr;