Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4546)

Unified Diff: chrome/browser/ui/views/frame/opaque_browser_frame_view.cc

Issue 2832823002: Update avatar button to MD (Closed)
Patch Set: Fixed ProfileChooserViewExtensionsTest browser tests Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
index 0cf4dc08ce2e4129dad83e0739aaf087b7e37e15..7c636e3ec516112b37c340e2eb98fef2e1da9398 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
@@ -155,8 +155,8 @@ gfx::Size OpaqueBrowserFrameView::GetMinimumSize() const {
return layout_->GetMinimumSize(width());
}
-views::View* OpaqueBrowserFrameView::GetProfileSwitcherView() const {
- return profile_switcher_.view();
+views::MenuButton* OpaqueBrowserFrameView::GetProfileSwitcherButton() const {
+ return profile_switcher_.button();
}
///////////////////////////////////////////////////////////////////////////////
@@ -177,10 +177,10 @@ bool OpaqueBrowserFrameView::IsWithinAvatarMenuButtons(
profile_indicator_icon()->GetMirroredBounds().Contains(point)) {
return true;
}
- if (profile_switcher_.view() &&
- profile_switcher_.view()->GetMirroredBounds().Contains(point)) {
+
+ views::View* button_view = GetProfileSwitcherButton();
msarda 2017/04/21 09:43:28 Nit: This is just the button, not another view. Co
emx 2017/04/24 16:23:10 Done.
+ if (button_view && button_view->GetMirroredBounds().Contains(point))
return true;
- }
return false;
}

Powered by Google App Engine
This is Rietveld 408576698