chrome/browser/ui/views/avatar_menu_bubble_view.cc - Issue 64313005: Fix crash when locking a profile.

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 64313005: Fix crash when locking a profile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix flaky test 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:

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 63334d531e9c9a4351461a5739feefa8a064d2d4..f08984344c3b2acf750dd880e96711fbc8fedd89 100644

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

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

@@ -15,6 +15,7 @@

#include "chrome/browser/profiles/profile_info_cache.h"

#include "chrome/browser/profiles/profile_info_util.h"

#include "chrome/browser/profiles/profile_manager.h"

+#include "chrome/browser/profiles/profile_window.h"

#include "chrome/browser/signin/signin_manager.h"

#include "chrome/browser/signin/signin_manager_factory.h"

#include "chrome/browser/ui/browser.h"

@@ -658,7 +659,7 @@ void AvatarMenuBubbleView::ButtonPressed(views::Button* sender,

chrome::ShowSettingsSubPage(browser_, subpage);

return;

} else if (sender->tag() == IDS_PROFILES_PROFILE_SIGNOUT_BUTTON) {

- avatar_menu_->BeginSignOut();

+ profiles::LockProfile(browser_->profile());

return;

}