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

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: 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
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..2001461f321dec9a4494fcb02c591f2b8cec1f82 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 clear_close_on_deactivate_for_testing() {
+ close_on_deactivate_for_testing_ = false;
}
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();
« no previous file with comments | « 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 »

Powered by Google App Engine
This is Rietveld 408576698