chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc - Issue 60583003: The chrome.screenlockPrivate API allows select apps to control the ChromeOS ScreenLocker.

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/chrome_browser_main_extra_parts_profiles.cc

Issue 60583003: The chrome.screenlockPrivate API allows select apps to control the ChromeOS ScreenLocker. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: clean up apitest.cc 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/extension_function_histogram_value.h ('k') | chrome/chrome_browser_extensions.gypi » ('j') | chrome/common/extensions/docs/examples/api/screenlockPrivate/weblocker/bg.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

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

index 14fb231d814d84f615db6a01e362e37ede973913..00f16148c1df2231fb73a0e98139f95cf1c54dbb 100644

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

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

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

#if defined(OS_CHROMEOS)

#include "chrome/browser/chromeos/extensions/input_method_api.h"

#include "chrome/browser/chromeos/extensions/media_player_api.h"

+#include "chrome/browser/chromeos/extensions/screenlock_private_api.h"

#include "chrome/browser/extensions/api/input_ime/input_ime_api.h"

#include "chrome/browser/extensions/api/networking_private/networking_private_event_router_factory.h"

#if defined(FILE_MANAGER_EXTENSION)

@@ -265,6 +266,7 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {

#if defined(OS_CHROMEOS)

extensions::InputImeAPI::GetFactoryInstance();

extensions::InputMethodAPI::GetFactoryInstance();

+ extensions::ScreenlockPrivateEventRouter::GetFactoryInstance();

#endif

extensions::LocationManager::GetFactoryInstance();

extensions::ManagementAPI::GetFactoryInstance();