Rename ProfileChooserView to ProfileMenuView

Bug: 966388
Change-Id: I09461f0f9f64f162d53cece7c81a013b84d2ba2c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1749090
Commit-Queue: Thomas Tangl <tangltom@chromium.org>
Reviewed-by: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#686362}

chrome/browser/profiles/profile_window.h

@@ -126,7 +126,7 @@ void CreateSystemProfileForUserManager(
     const base::Callback<void(Profile*, const std::string&)>& callback);
 
 // Converts from modes in the avatar menu to modes understood by
-// ProfileChooserView.
+// ProfileMenuView.
 void BubbleViewModeFromAvatarBubbleMode(BrowserWindow::AvatarBubbleMode mode,
                                         Profile* profile,
                                         BubbleViewMode* bubble_view_mode);

chrome/browser/ui/BUILD.gn

@@ -2015,8 +2015,8 @@ jumbo_split_static_library("ui") {
       "views/message_center/popups_only_ui_delegate.h",
       "views/profiles/badged_profile_photo.cc",
       "views/profiles/badged_profile_photo.h",
-      "views/profiles/profile_chooser_view.cc",
-      "views/profiles/profile_chooser_view.h",
+      "views/profiles/profile_menu_view.cc",
+      "views/profiles/profile_menu_view.h",
       "views/profiles/signin_view_controller_delegate_views.cc",
       "views/profiles/signin_view_controller_delegate_views.h",
       "views/profiles/user_manager_view.cc",

chrome/browser/ui/views/bookmarks/bookmark_bubble_sign_in_delegate_browsertest.cc

@@ -31,7 +31,7 @@
 #include "ui/gfx/range/range.h"
 
 #if !defined(OS_CHROMEOS)
-#include "chrome/browser/ui/views/profiles/profile_chooser_view.h"
+#include "chrome/browser/ui/views/profiles/profile_menu_view.h"
 #endif
 
 namespace {
@@ -129,7 +129,7 @@ IN_PROC_BROWSER_TEST_F(BookmarkBubbleSignInDelegateTest,
   if (IsSigninModal(profile())) {
 #if !defined(OS_CHROMEOS)
     // ProfileChooser doesn't show in an incognito window.
-    EXPECT_FALSE(ProfileChooserView::IsShowing());
+    EXPECT_FALSE(ProfileMenuView::IsShowing());
 #endif
 
     // Sign-in dialog is shown when there is at least one tab in the

chrome/browser/ui/views/profiles/profile_chooser_view.h → chrome/browser/ui/views/profiles/profile_menu_view.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_
-#define CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_MENU_VIEW_H_
+#define CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_MENU_VIEW_H_
 
 #include <stddef.h>
 
@@ -33,19 +33,19 @@ class HoverButton;
 
 // This bubble view is displayed when the user clicks on the avatar button.
 // It displays a list of profiles and allows users to switch between profiles.
-class ProfileChooserView : public ProfileMenuViewBase,
+class ProfileMenuView : public ProfileMenuViewBase,
                            public AvatarMenuObserver,
                            public signin::IdentityManager::Observer {
  public:
-  ProfileChooserView(views::Button* anchor_button,
+  ProfileMenuView(views::Button* anchor_button,
                      Browser* browser,
                      profiles::BubbleViewMode view_mode,
                      signin::GAIAServiceType service_type,
                      signin_metrics::AccessPoint access_point);
-  ~ProfileChooserView() override;
+  ~ProfileMenuView() override;
 
  private:
-  friend class ProfileChooserViewExtensionsTest;
+  friend class ProfileMenuViewExtensionsTest;
 
   typedef std::vector<size_t> Indexes;
   typedef std::map<views::Button*, int> ButtonIndexes;
@@ -88,7 +88,7 @@ class ProfileChooserView : public ProfileMenuViewBase,
   void ShowViewOrOpenTab(profiles::BubbleViewMode mode);
 
   // Adds the profile chooser view.
-  void AddProfileChooserView(AvatarMenu* avatar_menu);
+  void AddProfileMenuView(AvatarMenu* avatar_menu);
 
   // Adds the main profile card for the profile |avatar_item|. |is_guest| is
   // used to determine whether to show any Sign in/Sign out/Manage accounts
@@ -192,7 +192,7 @@ class ProfileChooserView : public ProfileMenuViewBase,
 
   const bool dice_enabled_;
 
-  DISALLOW_COPY_AND_ASSIGN(ProfileChooserView);
+  DISALLOW_COPY_AND_ASSIGN(ProfileMenuView);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_MENU_VIEW_H_

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

@@ -27,7 +27,7 @@
 #include "ui/views/controls/separator.h"
 
 #if !defined(OS_CHROMEOS)
-#include "chrome/browser/ui/views/profiles/profile_chooser_view.h"
+#include "chrome/browser/ui/views/profiles/profile_menu_view.h"
 #include "chrome/browser/ui/views/sync/dice_signin_button_view.h"
 #endif
 
@@ -82,7 +82,7 @@ void ProfileMenuViewBase::ShowBubble(
     bubble = new IncognitoMenuView(anchor_button, browser);
   } else {
 #if !defined(OS_CHROMEOS)
-    bubble = new ProfileChooserView(anchor_button, browser, view_mode,
+    bubble = new ProfileMenuView(anchor_button, browser, view_mode,
                                     manage_accounts_params.service_type,
                                     access_point);
 #else

chrome/browser/ui/views/profiles/profile_menu_view_base.h

@@ -138,7 +138,7 @@ class ProfileMenuViewBase : public content::WebContentsDelegate,
   int GetDefaultIconSize();
 
  private:
-  friend class ProfileChooserViewExtensionsTest;
+  friend class ProfileMenuViewExtensionsTest;
 
   // Requests focus for a button when opened by keyboard.
   virtual void FocusButtonOnKeyboardOpen() {}

chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc

@@ -17,7 +17,7 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/chrome_layout_provider.h"
 #include "chrome/browser/ui/views/chrome_typography.h"
-#include "chrome/browser/ui/views/profiles/profile_chooser_view.h"
+#include "chrome/browser/ui/views/profiles/profile_menu_view.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/constrained_window/constrained_window_views.h"
@@ -71,7 +71,7 @@ void ProfileSigninConfirmationDialogViews::ShowDialog(
   // bubble.
   // TODO(guohui): removes the workaround once the profile confirmation dialog
   // is fixed.
-  ProfileChooserView::Hide();
+  ProfileMenuView::Hide();
 
   ProfileSigninConfirmationDialogViews* dialog =
       new ProfileSigninConfirmationDialogViews(browser, username,

chrome/test/BUILD.gn

@@ -1874,7 +1874,7 @@ if (!is_android) {
         "../browser/ui/views/payments/profile_list_view_controller_browsertest.cc",
         "../browser/ui/views/payments/shipping_address_editor_view_controller_browsertest.cc",
         "../browser/ui/views/payments/shipping_option_view_controller_browsertest.cc",
-        "../browser/ui/views/profiles/profile_chooser_view_browsertest.cc",
+        "../browser/ui/views/profiles/profile_menu_view_browsertest.cc",
         "../browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog_browsertest.cc",
         "../browser/ui/views/select_file_dialog_extension_browsertest.cc",
         "../browser/ui/views/session_crashed_bubble_view_browsertest.cc",
@@ -2273,7 +2273,7 @@ if (!is_android) {
         "../browser/ui/views/external_protocol_dialog_browsertest.cc",
 
         # chromeos does not use the profile chooser view
-        "../browser/ui/views/profiles/profile_chooser_view_browsertest.cc",
+        "../browser/ui/views/profiles/profile_menu_view_browsertest.cc",
 
         # inline login UI is disabled on chromeos
         "../browser/ui/views/sync/inline_login_ui_browsertest.cc",

testing/buildbot/filters/mac_window_server_killers.browser_tests.filter

@@ -179,8 +179,8 @@
 -PrintPreviewSettingsSectionsTest.*
 -PrintPreviewUIBrowserTest.*
 -ProcessManagerBrowserTest.*
--ProfileChooserViewExtensionsTest.*
 -ProfileMainNetworkContext/NetworkContextConfigurationBrowserTest.*
+-ProfileMenuViewExtensionsTest.*
 -ProfileSigninConfirmationHelperBrowserTest.*
 -PushMessagingBrowserTest.*
 -RedirectTest.*