| Index: chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc
|
| diff --git a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc
|
| index 38be67ca446e7d4b602ec24e58db590f9852cc1b..6ea354c7b80c567faa40a7528e05b4d745fb0fd3 100644
|
| --- a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc
|
| +++ b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc
|
| @@ -720,10 +720,15 @@ void ManagePasswordsBubbleView::ShowBubble(
|
|
|
| BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser);
|
| bool is_fullscreen = browser_view->IsFullscreen();
|
| - ManagePasswordsIconViews* anchor_view =
|
| - is_fullscreen
|
| - ? NULL
|
| - : browser_view->GetLocationBarView()->manage_passwords_icon_view();
|
| + views::View* anchor_view = nullptr;
|
| + if (!is_fullscreen) {
|
| + if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
|
| + anchor_view = browser_view->GetLocationBarView();
|
| + } else {
|
| + anchor_view =
|
| + browser_view->GetLocationBarView()->manage_passwords_icon_view();
|
| + }
|
| + }
|
| manage_passwords_bubble_ = new ManagePasswordsBubbleView(
|
| web_contents, anchor_view, reason);
|
|
|
| @@ -732,8 +737,10 @@ void ManagePasswordsBubbleView::ShowBubble(
|
|
|
| views::Widget* manage_passwords_bubble_widget =
|
| views::BubbleDialogDelegateView::CreateBubble(manage_passwords_bubble_);
|
| - if (anchor_view)
|
| - manage_passwords_bubble_widget->AddObserver(anchor_view);
|
| + if (anchor_view) {
|
| + manage_passwords_bubble_widget->AddObserver(
|
| + browser_view->GetLocationBarView()->manage_passwords_icon_view());
|
| + }
|
|
|
| // Adjust for fullscreen after creation as it relies on the content size.
|
| if (is_fullscreen) {
|
|
|