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

Side by Side 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 test.js 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h" 5 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h"
6 6
7 #include "apps/app_keep_alive_service_factory.h" 7 #include "apps/app_keep_alive_service_factory.h"
8 #include "apps/app_load_service_factory.h" 8 #include "apps/app_load_service_factory.h"
9 #include "apps/app_restore_service_factory.h" 9 #include "apps/app_restore_service_factory.h"
10 #include "apps/shell_window_geometry_cache.h" 10 #include "apps/shell_window_geometry_cache.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 #endif 128 #endif
129 129
130 #if defined(ENABLE_MANAGED_USERS) 130 #if defined(ENABLE_MANAGED_USERS)
131 #include "chrome/browser/managed_mode/managed_user_service_factory.h" 131 #include "chrome/browser/managed_mode/managed_user_service_factory.h"
132 #include "chrome/browser/managed_mode/managed_user_sync_service_factory.h" 132 #include "chrome/browser/managed_mode/managed_user_sync_service_factory.h"
133 #endif 133 #endif
134 134
135 #if defined(OS_CHROMEOS) 135 #if defined(OS_CHROMEOS)
136 #include "chrome/browser/chromeos/extensions/input_method_api.h" 136 #include "chrome/browser/chromeos/extensions/input_method_api.h"
137 #include "chrome/browser/chromeos/extensions/media_player_api.h" 137 #include "chrome/browser/chromeos/extensions/media_player_api.h"
138 #include "chrome/browser/chromeos/extensions/screenlock_private_api.h"
138 #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" 139 #include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
139 #include "chrome/browser/extensions/api/networking_private/networking_private_ev ent_router_factory.h" 140 #include "chrome/browser/extensions/api/networking_private/networking_private_ev ent_router_factory.h"
140 #if defined(FILE_MANAGER_EXTENSION) 141 #if defined(FILE_MANAGER_EXTENSION)
141 #include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_a pi_factory.h" 142 #include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_a pi_factory.h"
142 #endif 143 #endif
143 #endif 144 #endif
144 145
145 #if defined(USE_AURA) 146 #if defined(USE_AURA)
146 #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h" 147 #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h"
147 #endif 148 #endif
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 extensions::HistoryAPI::GetFactoryInstance(); 259 extensions::HistoryAPI::GetFactoryInstance();
259 extensions::IdentityAPI::GetFactoryInstance(); 260 extensions::IdentityAPI::GetFactoryInstance();
260 extensions::IdleManagerFactory::GetInstance(); 261 extensions::IdleManagerFactory::GetInstance();
261 extensions::InstallTrackerFactory::GetInstance(); 262 extensions::InstallTrackerFactory::GetInstance();
262 #if defined(TOOLKIT_VIEWS) 263 #if defined(TOOLKIT_VIEWS)
263 extensions::InputAPI::GetFactoryInstance(); 264 extensions::InputAPI::GetFactoryInstance();
264 #endif 265 #endif
265 #if defined(OS_CHROMEOS) 266 #if defined(OS_CHROMEOS)
266 extensions::InputImeAPI::GetFactoryInstance(); 267 extensions::InputImeAPI::GetFactoryInstance();
267 extensions::InputMethodAPI::GetFactoryInstance(); 268 extensions::InputMethodAPI::GetFactoryInstance();
269 extensions::ScreenlockPrivateEventRouter::GetFactoryInstance();
268 #endif 270 #endif
269 extensions::LocationManager::GetFactoryInstance(); 271 extensions::LocationManager::GetFactoryInstance();
270 extensions::ManagementAPI::GetFactoryInstance(); 272 extensions::ManagementAPI::GetFactoryInstance();
271 extensions::MDnsAPI::GetFactoryInstance(); 273 extensions::MDnsAPI::GetFactoryInstance();
272 extensions::MediaGalleriesPrivateAPI::GetFactoryInstance(); 274 extensions::MediaGalleriesPrivateAPI::GetFactoryInstance();
273 #if defined(OS_CHROMEOS) 275 #if defined(OS_CHROMEOS)
274 extensions::MediaPlayerAPI::GetFactoryInstance(); 276 extensions::MediaPlayerAPI::GetFactoryInstance();
275 #endif 277 #endif
276 extensions::OmniboxAPI::GetFactoryInstance(); 278 extensions::OmniboxAPI::GetFactoryInstance();
277 #if defined(ENABLE_PLUGINS) 279 #if defined(ENABLE_PLUGINS)
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 #if defined(ENABLE_EXTENSIONS) 371 #if defined(ENABLE_EXTENSIONS)
370 TokenCacheServiceFactory::GetInstance(); 372 TokenCacheServiceFactory::GetInstance();
371 #endif 373 #endif
372 TokenServiceFactory::GetInstance(); 374 TokenServiceFactory::GetInstance();
373 WebDataServiceFactory::GetInstance(); 375 WebDataServiceFactory::GetInstance();
374 } 376 }
375 377
376 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() { 378 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() {
377 EnsureBrowserContextKeyedServiceFactoriesBuilt(); 379 EnsureBrowserContextKeyedServiceFactoriesBuilt();
378 } 380 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698