chrome/browser/ui/views/profile_chooser_view.h - 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/profile_chooser_view.h

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: update the usage of the renamed function set_close_on_deactivate_for_testing Created 7 years, 2 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

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

Index: chrome/browser/ui/views/profile_chooser_view.h

diff --git a/chrome/browser/ui/views/profile_chooser_view.h b/chrome/browser/ui/views/profile_chooser_view.h

index 8affea1ae6159b327ad457e3db67c8e66a5ca57d..e99d4b114c89dd14dc8ddb5feea8c113b30e2d1b 100644

--- a/chrome/browser/ui/views/profile_chooser_view.h

+++ b/chrome/browser/ui/views/profile_chooser_view.h

@@ -50,8 +50,8 @@ class ProfileChooserView : public views::BubbleDelegateView,

// We normally close the bubble any time it becomes inactive but this can lead

// to flaky tests where unexpected UI events are triggering this behavior.

// Tests should call this with "false" for more consistent operation.

- static void set_close_on_deactivate(bool close) {

- close_on_deactivate_ = close;

+ static void set_close_on_deactivate_for_testing(bool close) {

+ close_on_deactivate_for_testing_ = close;

}

private:

@@ -89,7 +89,7 @@ class ProfileChooserView : public views::BubbleDelegateView,

virtual void OnAvatarMenuChanged(AvatarMenu* avatar_menu) OVERRIDE;

static ProfileChooserView* profile_bubble_;

- static bool close_on_deactivate_;

+ static bool close_on_deactivate_for_testing_;

void ResetLinksAndButtons();