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

Side by Side Diff: chrome/browser/profiles/profile_dependency_manager.cc

Issue 11618005: Pull InputIme stuff out of ExtensionService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit fixed Created 8 years 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
« no previous file with comments | « chrome/browser/extensions/extension_service.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/profile_dependency_manager.h" 5 #include "chrome/browser/profiles/profile_dependency_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <deque> 8 #include <deque>
9 #include <iterator> 9 #include <iterator>
10 10
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) 77 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
78 #include "chrome/browser/captive_portal/captive_portal_service_factory.h" 78 #include "chrome/browser/captive_portal/captive_portal_service_factory.h"
79 #endif 79 #endif
80 80
81 #if defined(ENABLE_CONFIGURATION_POLICY) 81 #if defined(ENABLE_CONFIGURATION_POLICY)
82 #include "chrome/browser/policy/user_policy_signin_service_factory.h" 82 #include "chrome/browser/policy/user_policy_signin_service_factory.h"
83 #endif 83 #endif
84 84
85 #if defined(OS_CHROMEOS) 85 #if defined(OS_CHROMEOS)
86 #include "chrome/browser/chromeos/extensions/input_method_api_factory.h" 86 #include "chrome/browser/chromeos/extensions/input_method_api_factory.h"
87 #include "chrome/browser/extensions/api/input_ime/input_ime_api_factory.h"
87 #endif 88 #endif
88 89
89 #if defined(USE_AURA) 90 #if defined(USE_AURA)
90 #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h" 91 #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h"
91 #endif 92 #endif
92 93
93 #ifndef NDEBUG 94 #ifndef NDEBUG
94 #include "base/command_line.h" 95 #include "base/command_line.h"
95 #include "base/file_util.h" 96 #include "base/file_util.h"
96 #include "chrome/common/chrome_switches.h" 97 #include "chrome/common/chrome_switches.h"
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 extensions::BookmarkAPIFactory::GetInstance(); 240 extensions::BookmarkAPIFactory::GetInstance();
240 extensions::BluetoothAPIFactory::GetInstance(); 241 extensions::BluetoothAPIFactory::GetInstance();
241 extensions::CommandServiceFactory::GetInstance(); 242 extensions::CommandServiceFactory::GetInstance();
242 extensions::CookiesAPIFactory::GetInstance(); 243 extensions::CookiesAPIFactory::GetInstance();
243 extensions::DialAPIFactory::GetInstance(); 244 extensions::DialAPIFactory::GetInstance();
244 extensions::ExtensionSystemFactory::GetInstance(); 245 extensions::ExtensionSystemFactory::GetInstance();
245 extensions::FontSettingsAPIFactory::GetInstance(); 246 extensions::FontSettingsAPIFactory::GetInstance();
246 extensions::HistoryAPIFactory::GetInstance(); 247 extensions::HistoryAPIFactory::GetInstance();
247 extensions::IdleManagerFactory::GetInstance(); 248 extensions::IdleManagerFactory::GetInstance();
248 #if defined(OS_CHROMEOS) 249 #if defined(OS_CHROMEOS)
250 extensions::InputImeAPIFactory::GetInstance();
249 extensions::InputMethodAPIFactory::GetInstance(); 251 extensions::InputMethodAPIFactory::GetInstance();
250 #endif 252 #endif
251 extensions::ManagedModeAPIFactory::GetInstance(); 253 extensions::ManagedModeAPIFactory::GetInstance();
252 extensions::MediaGalleriesPrivateAPIFactory::GetInstance(); 254 extensions::MediaGalleriesPrivateAPIFactory::GetInstance();
253 extensions::OmniboxAPIFactory::GetInstance(); 255 extensions::OmniboxAPIFactory::GetInstance();
254 extensions::PreferenceAPIFactory::GetInstance(); 256 extensions::PreferenceAPIFactory::GetInstance();
255 extensions::ProcessesAPIFactory::GetInstance(); 257 extensions::ProcessesAPIFactory::GetInstance();
256 extensions::PushMessagingAPIFactory::GetInstance(); 258 extensions::PushMessagingAPIFactory::GetInstance();
257 extensions::SuggestedLinksRegistryFactory::GetInstance(); 259 extensions::SuggestedLinksRegistryFactory::GetInstance();
258 extensions::TabCaptureRegistryFactory::GetInstance(); 260 extensions::TabCaptureRegistryFactory::GetInstance();
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 } 420 }
419 421
420 result.append("\n /* Toplevel profile */\n"); 422 result.append("\n /* Toplevel profile */\n");
421 result.append(" Profile [shape=box];\n"); 423 result.append(" Profile [shape=box];\n");
422 424
423 result.append("}\n"); 425 result.append("}\n");
424 return result; 426 return result;
425 } 427 }
426 428
427 #endif 429 #endif
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_service.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698