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

Side by Side Diff: apps/shell/browser/shell_extensions_browser_client.cc

Issue 183893041: Move sockets APIs out of src/chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rename api targets Created 6 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « apps/apps.gypi ('k') | apps/shell/common/DEPS » ('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 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 "apps/shell/browser/shell_extensions_browser_client.h" 5 #include "apps/shell/browser/shell_extensions_browser_client.h"
6 6
7 #include "apps/shell/browser/shell_app_sorting.h" 7 #include "apps/shell/browser/shell_app_sorting.h"
8 #include "apps/shell/browser/shell_extension_system_factory.h" 8 #include "apps/shell/browser/shell_extension_system_factory.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "base/prefs/pref_service_factory.h" 10 #include "base/prefs/pref_service_factory.h"
11 #include "base/prefs/testing_pref_store.h" 11 #include "base/prefs/testing_pref_store.h"
12 #include "chrome/common/extensions/api/generated_api.h" 12 #include "chrome/common/extensions/api/generated_api.h"
13 #include "components/user_prefs/pref_registry_syncable.h" 13 #include "components/user_prefs/pref_registry_syncable.h"
14 #include "components/user_prefs/user_prefs.h" 14 #include "components/user_prefs/user_prefs.h"
15 #include "extensions/browser/api/extensions_api_client.h" 15 #include "extensions/browser/api/extensions_api_client.h"
16 #include "extensions/browser/app_sorting.h" 16 #include "extensions/browser/app_sorting.h"
17 #include "extensions/browser/extension_prefs.h" 17 #include "extensions/browser/extension_prefs.h"
18 #include "extensions/common/api/generated_api.h"
18 19
19 using content::BrowserContext; 20 using content::BrowserContext;
20 21
21 namespace extensions { 22 namespace extensions {
22 namespace { 23 namespace {
23 24
24 // See chrome::RegisterProfilePrefs() in chrome/browser/prefs/browser_prefs.cc 25 // See chrome::RegisterProfilePrefs() in chrome/browser/prefs/browser_prefs.cc
25 void RegisterPrefs(user_prefs::PrefRegistrySyncable* registry) { 26 void RegisterPrefs(user_prefs::PrefRegistrySyncable* registry) {
26 ExtensionPrefs::RegisterProfilePrefs(registry); 27 ExtensionPrefs::RegisterProfilePrefs(registry);
27 } 28 }
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 return NULL; 151 return NULL;
151 } 152 }
152 153
153 ExtensionSystemProvider* 154 ExtensionSystemProvider*
154 ShellExtensionsBrowserClient::GetExtensionSystemFactory() { 155 ShellExtensionsBrowserClient::GetExtensionSystemFactory() {
155 return ShellExtensionSystemFactory::GetInstance(); 156 return ShellExtensionSystemFactory::GetInstance();
156 } 157 }
157 158
158 void ShellExtensionsBrowserClient::RegisterExtensionFunctions( 159 void ShellExtensionsBrowserClient::RegisterExtensionFunctions(
159 ExtensionFunctionRegistry* registry) const { 160 ExtensionFunctionRegistry* registry) const {
160 // TODO(rockot): Remove this once we have enough APIs moved out of src/chrome 161 extensions::core_api::GeneratedFunctionRegistry::RegisterAll(registry);
161 // See http://crbug.com/349042 162 // TODO(rockot): Remove dependency on src/chrome once we have some core APIs
163 // moved out. See http://crbug.com/349042.
162 extensions::api::GeneratedFunctionRegistry::RegisterAll(registry); 164 extensions::api::GeneratedFunctionRegistry::RegisterAll(registry);
163 } 165 }
164 166
165 } // namespace extensions 167 } // namespace extensions
OLDNEW
« no previous file with comments | « apps/apps.gypi ('k') | apps/shell/common/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698