X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fbrowser%2Fprofiles%2Fchrome_browser_main_extra_parts_profiles.cc;h=887fae684f08097eb87c4cc1a07c5a90474d9a76;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=1facb60411fd1bbbec73c53d68312e4932c95db6;hpb=7338fba38ba696536d1cc9d389afd716a6ab2fe6;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/src/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
index 1facb60..887fae6 100644
--- a/src/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/src/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -7,7 +7,7 @@
 #include "apps/app_keep_alive_service_factory.h"
 #include "apps/app_load_service_factory.h"
 #include "apps/app_restore_service_factory.h"
-#include "apps/shell_window_geometry_cache.h"
+#include "apps/app_window_geometry_cache.h"
 #include "chrome/browser/apps/ephemeral_app_service_factory.h"
 #include "chrome/browser/apps/shortcut_manager_factory.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
@@ -70,6 +70,7 @@
 #include "chrome/browser/extensions/api/feedback_private/feedback_private_api.h"
 #include "chrome/browser/extensions/api/font_settings/font_settings_api.h"
 #include "chrome/browser/extensions/api/history/history_api.h"
+#include "chrome/browser/extensions/api/hotword_private/hotword_private_api.h"
 #include "chrome/browser/extensions/api/identity/identity_api.h"
 #include "chrome/browser/extensions/api/idle/idle_manager_factory.h"
 #include "chrome/browser/extensions/api/input/input.h"
@@ -138,13 +139,17 @@
 #if defined(ENABLE_MANAGED_USERS)
 #include "chrome/browser/managed_mode/managed_user_service_factory.h"
 #include "chrome/browser/managed_mode/managed_user_sync_service_factory.h"
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/managed_mode/chromeos/managed_user_password_service_factory.h"
+#include "chrome/browser/managed_mode/chromeos/manager_password_service_factory.h"
+#endif
 #endif
 
 #if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.h"
 #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/chromeos/extensions/file_manager/file_browser_private_api_factory.h"
 #include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
 #include "chrome/browser/extensions/api/log_private/log_private_api.h"
 #endif
@@ -161,6 +166,10 @@
 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h"
 #endif
 
+#if defined(ENABLE_APP_LIST)
+#include "chrome/browser/ui/app_list/start_page_service_factory.h"
+#endif
+
 #if defined(ENABLE_SPELLCHECK)
 #include "chrome/browser/extensions/api/spellcheck/spellcheck_api.h"
 #include "chrome/browser/spellchecker/spellcheck_factory.h"
@@ -198,6 +207,9 @@ ChromeBrowserMainExtraPartsProfiles::~ChromeBrowserMainExtraPartsProfiles() {
 void ChromeBrowserMainExtraPartsProfiles::
 EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   AboutSigninInternalsFactory::GetInstance();
+#if defined(ENABLE_APP_LIST)
+  app_list::StartPageServiceFactory::GetInstance();
+#endif
   autofill::PersonalDataManagerFactory::GetInstance();
 #if !defined(OS_ANDROID)
   AutomaticProfileResetterFactory::GetInstance();
@@ -228,7 +240,7 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   AppShortcutManagerFactory::GetInstance();
   apps::AppLoadServiceFactory::GetInstance();
   apps::AppRestoreServiceFactory::GetInstance();
-  apps::ShellWindowGeometryCache::Factory::GetInstance();
+  apps::AppWindowGeometryCache::Factory::GetInstance();
   EphemeralAppServiceFactory::GetInstance();
   extensions::ActivityLogFactory::GetInstance();
   extensions::ActivityLogAPI::GetFactoryInstance();
@@ -263,6 +275,7 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   extensions::FeedbackPrivateAPI::GetFactoryInstance();
   extensions::FontSettingsAPI::GetFactoryInstance();
   extensions::HistoryAPI::GetFactoryInstance();
+  extensions::HotwordPrivateEventService::GetFactoryInstance();
   extensions::IdentityAPI::GetFactoryInstance();
   extensions::IdleManagerFactory::GetInstance();
   extensions::InstallTrackerFactory::GetInstance();
@@ -285,7 +298,7 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   extensions::MediaPlayerAPI::GetFactoryInstance();
 #endif
   extensions::MenuManagerFactory::GetInstance();
-#if defined(OS_CHROMEOS) || defined(OS_WIN)
+#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_MACOSX)
   extensions::NetworkingPrivateEventRouterFactory::GetInstance();
 #endif  // defined(OS_CHROMEOS) || defined(OS_WIN)
   extensions::OmniboxAPI::GetFactoryInstance();
@@ -334,6 +347,10 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {
 #if defined(ENABLE_MANAGED_USERS)
   ManagedUserServiceFactory::GetInstance();
   ManagedUserSyncServiceFactory::GetInstance();
+#if defined(OS_CHROMEOS)
+  ManagedUserPasswordServiceFactory::GetInstance();
+  ManagerPasswordServiceFactory::GetInstance();
+#endif
 #endif
 #if !defined(OS_ANDROID)
   MediaGalleriesPreferencesFactory::GetInstance();