trunk/src/chrome/browser/extensions/api/principals_private/principals_private_api.cc - Issue 75483005: Revert 235801 "Fix crash when locking a profile. The crash is ha..."

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: trunk/src/chrome/browser/extensions/api/principals_private/principals_private_api.cc

Issue 75483005: Revert 235801 "Fix crash when locking a profile. The crash is ha..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: 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: trunk/src/chrome/browser/extensions/api/principals_private/principals_private_api.cc

===================================================================

--- trunk/src/chrome/browser/extensions/api/principals_private/principals_private_api.cc (revision 235821)

+++ trunk/src/chrome/browser/extensions/api/principals_private/principals_private_api.cc (working copy)

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

#include "chrome/browser/browser_process.h"

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

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

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

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

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

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

@@ -25,7 +25,10 @@

bool PrincipalsPrivateSignOutFunction::RunImplSafe() {

Browser* browser = GetCurrentBrowser();

if (browser) {

- profiles::LockProfile(browser->profile());

+ AvatarMenu avatar_menu(

+ &g_browser_process->profile_manager()->GetProfileInfoCache(), NULL,

+ browser);

+ avatar_menu.BeginSignOut();

}

return true;

}