chrome/browser/profiles/profile_manager.cc - Issue 553243002: Track the active ExtensionKeybindingRegistry and make it available to EventRewriter.

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/profiles/profile_manager.cc

Issue 553243002: Track the active ExtensionKeybindingRegistry and make it available to EventRewriter. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr

Patch Set: Address test failures; sky's comments. Created 6 years, 3 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

« chrome/browser/extensions/extension_keybinding_apitest.cc ('K') | « chrome/browser/extensions/extension_keybinding_registry.h ('k') | chrome/browser/ui/views/toolbar/browser_actions_container.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/profile_manager.cc

diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc

index 20cb9d5d2b6f0975a101f129eff1cbe358c3098b..5be642ed61dc063b49f0cc51dc9712b80f5a09c7 100644

--- a/chrome/browser/profiles/profile_manager.cc

+++ b/chrome/browser/profiles/profile_manager.cc

@@ -334,6 +334,9 @@ Profile* ProfileManager::GetPrimaryUserProfile() {

Profile* ProfileManager::GetActiveUserProfile() {

ProfileManager* profile_manager = g_browser_process->profile_manager();

#if defined(OS_CHROMEOS)

+ if (!profile_manager)

+ return NULL;

if (!profile_manager->IsLoggedIn() ||

!user_manager::UserManager::IsInitialized()) {

return profile_manager->GetActiveUserOrOffTheRecordProfileFromPath(