chrome/browser/ui/views/avatar_menu_bubble_view.cc - Issue 51113006: Fix static set_close_on_deactivate overriding non-virtual base method

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/avatar_menu_bubble_view.cc

Issue 51113006: Fix static set_close_on_deactivate overriding non-virtual base method (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Change function prototype from set_close_on_deactivate_for_testing(bool close) to clear_close_on_de… Created 7 years, 1 month 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

« no previous file with comments | « chrome/browser/ui/views/avatar_menu_bubble_view.h ('k') | chrome/browser/ui/views/avatar_menu_button_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/avatar_menu_bubble_view.cc

diff --git a/chrome/browser/ui/views/avatar_menu_bubble_view.cc b/chrome/browser/ui/views/avatar_menu_bubble_view.cc

index 401ff60372d9e6615ec3b62e1d638c159b782175..63334d531e9c9a4351461a5739feefa8a064d2d4 100644

--- a/chrome/browser/ui/views/avatar_menu_bubble_view.cc

+++ b/chrome/browser/ui/views/avatar_menu_bubble_view.cc

@@ -477,7 +477,7 @@ ActionButtonView::ActionButtonView(views::ButtonListener* listener,

// static

AvatarMenuBubbleView* AvatarMenuBubbleView::avatar_bubble_ = NULL;

-bool AvatarMenuBubbleView::close_on_deactivate_ = true;

+bool AvatarMenuBubbleView::close_on_deactivate_for_testing_ = true;

// static

void AvatarMenuBubbleView::ShowBubble(

@@ -493,7 +493,7 @@ void AvatarMenuBubbleView::ShowBubble(

avatar_bubble_ = new AvatarMenuBubbleView(

anchor_view, arrow, anchor_rect, browser);

views::BubbleDelegateView::CreateBubble(avatar_bubble_);

- avatar_bubble_->set_close_on_deactivate(close_on_deactivate_);

+ avatar_bubble_->set_close_on_deactivate(close_on_deactivate_for_testing_);

avatar_bubble_->SetBackgroundColors();

avatar_bubble_->SetAlignment(border_alignment);

avatar_bubble_->GetWidget()->Show();

« no previous file with comments | « chrome/browser/ui/views/avatar_menu_bubble_view.h ('k') | chrome/browser/ui/views/avatar_menu_button_browsertest.cc » ('j') | no next file with comments »