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

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

Issue 2832823002: Update avatar button to MD (Closed)
Patch Set: Fix for --force-device-scale-factor, vector icon, review comments 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 c68146b2931e5163674a44b87c5f3adb65cd7543..299a72b2a537b42f1558377ddc0e1603282e727d 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::MenuButton* button = GetProfileSwitcherButton();
+ if (button && button->GetMirroredBounds().Contains(point))
return true;
- }
return false;
}

Powered by Google App Engine
This is Rietveld 408576698