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

Unified Diff: chrome/browser/ui/views/profiles/profile_chooser_view.cc

Issue 1235173002: Revert of Chrome user menu shouldn't close if a tab steals focus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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/profiles/profile_chooser_view.cc
diff --git a/chrome/browser/ui/views/profiles/profile_chooser_view.cc b/chrome/browser/ui/views/profiles/profile_chooser_view.cc
index fcbf281bcb91ba17c3740d75b8c767d4471b2ed3..f55258026ec657bf0ba3466211ae3fa8ea3bc099 100644
--- a/chrome/browser/ui/views/profiles/profile_chooser_view.cc
+++ b/chrome/browser/ui/views/profiles/profile_chooser_view.cc
@@ -518,18 +518,6 @@
}
// static
-ProfileChooserView::ShowingType ProfileChooserView::IsShowingInBrowser(
- const Browser* browser) {
- if (profile_bubble_ == nullptr)
- return IS_NOT_SHOWING;
-
- if (profile_bubble_->browser_ == browser || browser == nullptr)
- return IS_SHOWING;
-
- return IS_SHOWING_IN_ANOTHER_BROWSER;
-}
-
-// static
void ProfileChooserView::Hide() {
if (IsShowing())
profile_bubble_->GetWidget()->Close();
@@ -697,15 +685,6 @@
// Clears tutorial mode for all non-profile-chooser views.
if (view_mode_ != profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER)
tutorial_mode_ = profiles::TUTORIAL_MODE_NONE;
-
- if (view_mode_ == profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN ||
- view_mode_ == profiles::BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT ||
- view_mode_ == profiles::BUBBLE_VIEW_MODE_GAIA_REAUTH ||
- tutorial_mode_ == profiles::TUTORIAL_MODE_CONFIRM_SIGNIN) {
- profile_bubble_->set_close_on_deactivate(false);
- } else {
- profile_bubble_->set_close_on_deactivate(close_on_deactivate_for_testing_);
- }
layout->StartRow(1, 0);
layout->AddView(sub_view);
« no previous file with comments | « chrome/browser/ui/views/profiles/profile_chooser_view.h ('k') | chrome/browser/ui/webui/signin/inline_login_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698