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

Side by Side Diff: chrome/common/extensions/chrome_extensions_client.cc

Issue 450053003: Use a qualified path for grit includes in various chrome/ directories. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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
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/common/extensions/chrome_extensions_client.h" 5 #include "chrome/common/extensions/chrome_extensions_client.h"
6 6
7 #include "chrome/common/chrome_version_info.h" 7 #include "chrome/common/chrome_version_info.h"
8 #include "chrome/common/extensions/api/generated_schemas.h" 8 #include "chrome/common/extensions/api/generated_schemas.h"
9 #include "chrome/common/extensions/chrome_manifest_handlers.h" 9 #include "chrome/common/extensions/chrome_manifest_handlers.h"
10 #include "chrome/common/extensions/extension_constants.h" 10 #include "chrome/common/extensions/extension_constants.h"
11 #include "chrome/common/extensions/features/chrome_channel_feature_filter.h" 11 #include "chrome/common/extensions/features/chrome_channel_feature_filter.h"
12 #include "chrome/common/extensions/features/feature_channel.h" 12 #include "chrome/common/extensions/features/feature_channel.h"
13 #include "chrome/common/url_constants.h" 13 #include "chrome/common/url_constants.h"
14 #include "chrome/grit/common_resources.h"
15 #include "chrome/grit/generated_resources.h"
14 #include "content/public/common/url_constants.h" 16 #include "content/public/common/url_constants.h"
15 #include "extensions/common/api/generated_schemas.h" 17 #include "extensions/common/api/generated_schemas.h"
16 #include "extensions/common/common_manifest_handlers.h" 18 #include "extensions/common/common_manifest_handlers.h"
17 #include "extensions/common/extension.h" 19 #include "extensions/common/extension.h"
18 #include "extensions/common/extension_api.h" 20 #include "extensions/common/extension_api.h"
19 #include "extensions/common/features/api_feature.h" 21 #include "extensions/common/features/api_feature.h"
20 #include "extensions/common/features/base_feature_provider.h" 22 #include "extensions/common/features/base_feature_provider.h"
21 #include "extensions/common/features/feature_provider.h" 23 #include "extensions/common/features/feature_provider.h"
22 #include "extensions/common/features/json_feature_provider_source.h" 24 #include "extensions/common/features/json_feature_provider_source.h"
23 #include "extensions/common/features/manifest_feature.h" 25 #include "extensions/common/features/manifest_feature.h"
24 #include "extensions/common/features/permission_feature.h" 26 #include "extensions/common/features/permission_feature.h"
25 #include "extensions/common/features/simple_feature.h" 27 #include "extensions/common/features/simple_feature.h"
26 #include "extensions/common/manifest_constants.h" 28 #include "extensions/common/manifest_constants.h"
27 #include "extensions/common/manifest_handler.h" 29 #include "extensions/common/manifest_handler.h"
28 #include "extensions/common/permissions/api_permission_set.h" 30 #include "extensions/common/permissions/api_permission_set.h"
29 #include "extensions/common/permissions/permission_message.h" 31 #include "extensions/common/permissions/permission_message.h"
30 #include "extensions/common/permissions/permissions_info.h" 32 #include "extensions/common/permissions/permissions_info.h"
31 #include "extensions/common/url_pattern.h" 33 #include "extensions/common/url_pattern.h"
32 #include "extensions/common/url_pattern_set.h" 34 #include "extensions/common/url_pattern_set.h"
33 #include "grit/common_resources.h" 35 #include "extensions/grit/extensions_resources.h"
34 #if defined(ENABLE_EXTENSIONS)
35 #include "grit/extensions_api_resources.h"
36 #endif
37 #include "grit/extensions_resources.h"
38 #include "grit/generated_resources.h"
39 #include "ui/base/l10n/l10n_util.h" 36 #include "ui/base/l10n/l10n_util.h"
40 #include "url/gurl.h" 37 #include "url/gurl.h"
41 38
39 #if defined(ENABLE_EXTENSIONS)
not at google - send to devlin 2014/08/08 13:55:54 i presume that eventually this'll be unnecessary b
Lei Zhang 2014/08/08 19:10:50 Yes, but we are not quite there yet. Only chrome/b
40 #include "chrome/grit/extensions_api_resources.h"
41 #endif
42
42 namespace extensions { 43 namespace extensions {
43 44
44 namespace { 45 namespace {
45 46
46 const char kThumbsWhiteListedExtension[] = "khopmbdjffemhegeeobelklnbglcdgfh"; 47 const char kThumbsWhiteListedExtension[] = "khopmbdjffemhegeeobelklnbglcdgfh";
47 48
48 template <class FeatureClass> 49 template <class FeatureClass>
49 SimpleFeature* CreateFeature() { 50 SimpleFeature* CreateFeature() {
50 SimpleFeature* feature = new FeatureClass; 51 SimpleFeature* feature = new FeatureClass;
51 feature->AddFilter( 52 feature->AddFilter(
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 // Suppress fatal errors only on beta and stable channels. 269 // Suppress fatal errors only on beta and stable channels.
269 return GetCurrentChannel() > chrome::VersionInfo::CHANNEL_DEV; 270 return GetCurrentChannel() > chrome::VersionInfo::CHANNEL_DEV;
270 } 271 }
271 272
272 // static 273 // static
273 ChromeExtensionsClient* ChromeExtensionsClient::GetInstance() { 274 ChromeExtensionsClient* ChromeExtensionsClient::GetInstance() {
274 return g_client.Pointer(); 275 return g_client.Pointer();
275 } 276 }
276 277
277 } // namespace extensions 278 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/common/extensions/api/plugins/plugins_handler.cc ('k') | chrome/common/extensions/command.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698