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

Unified Diff: chrome/browser/ui/views/profile_chooser_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: 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
Index: chrome/browser/ui/views/profile_chooser_view.cc
diff --git a/chrome/browser/ui/views/profile_chooser_view.cc b/chrome/browser/ui/views/profile_chooser_view.cc
index 3c53784f51fe5a2c804d29f8a67a3f2d96ce60a1..8d11917f8a5b02ec752d01b0663cf4611c2fa8f0 100644
--- a/chrome/browser/ui/views/profile_chooser_view.cc
+++ b/chrome/browser/ui/views/profile_chooser_view.cc
@@ -181,7 +181,7 @@ class BackgroundColorHoverButton : public views::TextButton {
// static
ProfileChooserView* ProfileChooserView::profile_bubble_ = NULL;
-bool ProfileChooserView::close_on_deactivate_ = true;
+bool ProfileChooserView::close_on_deactivate_for_testing_ = true;
// static
void ProfileChooserView::ShowBubble(
@@ -197,7 +197,7 @@ void ProfileChooserView::ShowBubble(
profile_bubble_ = new ProfileChooserView(
anchor_view, arrow, anchor_rect, browser);
views::BubbleDelegateView::CreateBubble(profile_bubble_);
- profile_bubble_->set_close_on_deactivate(close_on_deactivate_);
+ profile_bubble_->set_close_on_deactivate(close_on_deactivate_for_testing_);
profile_bubble_->SetAlignment(border_alignment);
profile_bubble_->GetWidget()->Show();
profile_bubble_->SetArrowPaintType(views::BubbleBorder::PAINT_NONE);

Powered by Google App Engine
This is Rietveld 408576698