ProfileMenuViewBase: Remove anchor_rect and parent_window

ProfileMenuViewBase (and its subclasses ProfileChooserView and
IncognitoMenuView) provied two options for positioning: Either via an
|anchor_button| or via an |anchor_rect| plus |parent_window|. However,
in practice, only the first option is ever used, so this CL removes the
always-empty |anchor_rect| and |parent_window| params.

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

chrome/browser/ui/views/frame/browser_view.cc

@@ -2997,9 +2997,9 @@ void BrowserView::ShowAvatarBubbleFromAvatarButton(
     return;
   }
 #endif
-  ProfileMenuViewBase::ShowBubble(
-      bubble_view_mode, manage_accounts_params, access_point, avatar_button,
-      nullptr, gfx::Rect(), browser(), focus_first_profile_button);
+  ProfileMenuViewBase::ShowBubble(bubble_view_mode, manage_accounts_params,
+                                  access_point, avatar_button, browser(),
+                                  focus_first_profile_button);
   ProfileMetrics::LogProfileOpenMethod(ProfileMetrics::ICON_AVATAR_BUBBLE);
 }
 

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

@@ -25,10 +25,8 @@
 #include "ui/views/style/typography.h"
 
 IncognitoMenuView::IncognitoMenuView(views::Button* anchor_button,
-                                     const gfx::Rect& anchor_rect,
-                                     gfx::NativeView parent_window,
                                      Browser* browser)
-    : ProfileMenuViewBase(anchor_button, anchor_rect, parent_window, browser) {
+    : ProfileMenuViewBase(anchor_button, browser) {
   DCHECK(browser->profile()->IsIncognitoProfile());
   GetViewAccessibility().OverrideName(GetAccessibleWindowTitle());
 

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

@@ -23,8 +23,6 @@ class Browser;
 class IncognitoMenuView : public ProfileMenuViewBase {
  public:
   IncognitoMenuView(views::Button* anchor_button,
-                    const gfx::Rect& anchor_rect,
-                    gfx::NativeView parent_window,
                     Browser* browser);
   ~IncognitoMenuView() override;
 

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

@@ -123,13 +123,11 @@ gfx::ImageSkia GetGoogleIconForUserMenu(int icon_size) {
 bool ProfileChooserView::close_on_deactivate_for_testing_ = true;
 
 ProfileChooserView::ProfileChooserView(views::Button* anchor_button,
-                                       const gfx::Rect& anchor_rect,
-                                       gfx::NativeView parent_window,
                                        Browser* browser,
                                        profiles::BubbleViewMode view_mode,
                                        signin::GAIAServiceType service_type,
                                        signin_metrics::AccessPoint access_point)
-    : ProfileMenuViewBase(anchor_button, anchor_rect, parent_window, browser),
+    : ProfileMenuViewBase(anchor_button, browser),
       view_mode_(view_mode),
       gaia_service_type_(service_type),
       access_point_(access_point),

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

@@ -38,8 +38,6 @@ class ProfileChooserView : public ProfileMenuViewBase,
                            public identity::IdentityManager::Observer {
  public:
   ProfileChooserView(views::Button* anchor_button,
-                     const gfx::Rect& anchor_rect,
-                     gfx::NativeView parent_window,
                      Browser* browser,
                      profiles::BubbleViewMode view_mode,
                      signin::GAIAServiceType service_type,

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

@@ -69,8 +69,6 @@ void ProfileMenuViewBase::ShowBubble(
     const signin::ManageAccountsParams& manage_accounts_params,
     signin_metrics::AccessPoint access_point,
     views::Button* anchor_button,
-    gfx::NativeView parent_window,
-    const gfx::Rect& anchor_rect,
     Browser* browser,
     bool is_source_keyboard) {
   if (IsShowing())
@@ -81,13 +79,12 @@ void ProfileMenuViewBase::ShowBubble(
 
   ProfileMenuViewBase* bubble;
   if (view_mode == profiles::BUBBLE_VIEW_MODE_INCOGNITO) {
-    bubble = new IncognitoMenuView(anchor_button, anchor_rect, parent_window,
-                                   browser);
+    bubble = new IncognitoMenuView(anchor_button, browser);
   } else {
 #if !defined(OS_CHROMEOS)
-    bubble = new ProfileChooserView(
-        anchor_button, anchor_rect, parent_window, browser, view_mode,
-        manage_accounts_params.service_type, access_point);
+    bubble = new ProfileChooserView(anchor_button, browser, view_mode,
+                                    manage_accounts_params.service_type,
+                                    access_point);
 #else
     NOTREACHED();
     return;
@@ -116,8 +113,6 @@ ProfileMenuViewBase* ProfileMenuViewBase::GetBubbleForTesting() {
 }
 
 ProfileMenuViewBase::ProfileMenuViewBase(views::Button* anchor_button,
-                                         const gfx::Rect& anchor_rect,
-                                         gfx::NativeView parent_window,
                                          Browser* browser)
     : BubbleDialogDelegateView(anchor_button, views::BubbleBorder::TOP_RIGHT),
       browser_(browser),
@@ -130,13 +125,8 @@ ProfileMenuViewBase::ProfileMenuViewBase(views::Button* anchor_button,
   // The sign in webview will be clipped on the bottom corners without these
   // margins, see related bug <http://crbug.com/593203>.
   set_margins(gfx::Insets(2, 0));
-  if (anchor_button) {
-    anchor_button->AnimateInkDrop(views::InkDropState::ACTIVATED, nullptr);
-  } else {
-    DCHECK(parent_window);
-    SetAnchorRect(anchor_rect);
-    set_parent_window(parent_window);
-  }
+  DCHECK(anchor_button);
+  anchor_button->AnimateInkDrop(views::InkDropState::ACTIVATED, nullptr);
 
   EnableUpDownKeyboardAccelerators();
   GetViewAccessibility().OverrideRole(ax::mojom::Role::kMenu);

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

@@ -74,16 +74,11 @@ class ProfileMenuViewBase : public content::WebContentsDelegate,
   // call this function when the button is clicked and if the bubble isn't
   // showing it will appear while if it is showing, nothing will happen here and
   // the existing bubble will auto-close due to focus loss.
-  // There are 2 ways to position the Bubble, if |anchor_button| is set, then
-  // |parent_window| and |anchor_rect| are ignored. Otherwise, |parent_window|
-  // and |anchor_rect| have to be set.
   static void ShowBubble(
       profiles::BubbleViewMode view_mode,
       const signin::ManageAccountsParams& manage_accounts_params,
       signin_metrics::AccessPoint access_point,
       views::Button* anchor_button,
-      gfx::NativeView parent_window,
-      const gfx::Rect& anchor_rect,
       Browser* browser,
       bool is_source_keyboard);
 
@@ -94,8 +89,6 @@ class ProfileMenuViewBase : public content::WebContentsDelegate,
 
  protected:
   ProfileMenuViewBase(views::Button* anchor_button,
-                      const gfx::Rect& anchor_rect,
-                      gfx::NativeView parent_window,
                       Browser* browser);
   ~ProfileMenuViewBase() override;