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

Side by Side Diff: chrome/browser/extensions/component_extensions_whitelist/whitelist.cc

Issue 2405013002: Move some global feature defines to buildflags (Closed)
Patch Set: Comment Created 4 years, 2 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/extensions/component_extensions_whitelist/whitelist.h" 5 #include "chrome/browser/extensions/component_extensions_whitelist/whitelist.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "build/build_config.h" 11 #include "build/build_config.h"
12 #include "chrome/common/extensions/extension_constants.h" 12 #include "chrome/common/extensions/extension_constants.h"
13 #include "chrome/common/features.h"
13 #include "chrome/grit/browser_resources.h" 14 #include "chrome/grit/browser_resources.h"
14 #include "extensions/common/constants.h" 15 #include "extensions/common/constants.h"
15 16
16 #if defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS) 17 #if defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
17 #include "chrome/browser/ui/app_list/google_now_extension.h" 18 #include "chrome/browser/ui/app_list/google_now_extension.h"
18 #endif 19 #endif
19 20
20 #if defined(OS_CHROMEOS) 21 #if defined(OS_CHROMEOS)
21 #include "chrome/browser/chromeos/input_method/component_extension_ime_manager_i mpl.h" 22 #include "chrome/browser/chromeos/input_method/component_extension_ime_manager_i mpl.h"
22 #include "components/chrome_apps/grit/chrome_apps_resources.h" 23 #include "components/chrome_apps/grit/chrome_apps_resources.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 #endif 77 #endif
77 #if defined(ENABLE_PRINTING) 78 #if defined(ENABLE_PRINTING)
78 case IDR_CLOUDPRINT_MANIFEST: 79 case IDR_CLOUDPRINT_MANIFEST:
79 #endif 80 #endif
80 case IDR_CRYPTOTOKEN_MANIFEST: 81 case IDR_CRYPTOTOKEN_MANIFEST:
81 case IDR_FEEDBACK_MANIFEST: 82 case IDR_FEEDBACK_MANIFEST:
82 case IDR_GAIA_AUTH_MANIFEST: 83 case IDR_GAIA_AUTH_MANIFEST:
83 #if defined(ENABLE_GOOGLE_NOW) 84 #if defined(ENABLE_GOOGLE_NOW)
84 case IDR_GOOGLE_NOW_MANIFEST: 85 case IDR_GOOGLE_NOW_MANIFEST:
85 #endif 86 #endif
86 #if defined(GOOGLE_CHROME_BUILD) || defined(ENABLE_HANGOUT_SERVICES_EXTENSION) 87 #if defined(GOOGLE_CHROME_BUILD) || BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION)
87 case IDR_HANGOUT_SERVICES_MANIFEST: 88 case IDR_HANGOUT_SERVICES_MANIFEST:
88 #endif 89 #endif
89 #if defined(ENABLE_HOTWORDING) 90 #if defined(ENABLE_HOTWORDING)
90 case IDR_HOTWORD_AUDIO_VERIFICATION_MANIFEST: 91 case IDR_HOTWORD_AUDIO_VERIFICATION_MANIFEST:
91 case IDR_HOTWORD_MANIFEST: 92 case IDR_HOTWORD_MANIFEST:
92 #endif 93 #endif
93 case IDR_IDENTITY_API_SCOPE_APPROVAL_MANIFEST: 94 case IDR_IDENTITY_API_SCOPE_APPROVAL_MANIFEST:
94 #if defined(IMAGE_LOADER_EXTENSION) 95 #if defined(IMAGE_LOADER_EXTENSION)
95 case IDR_IMAGE_LOADER_MANIFEST: 96 case IDR_IMAGE_LOADER_MANIFEST:
96 #endif 97 #endif
(...skipping 29 matching lines...) Expand all
126 } 127 }
127 128
128 LOG(ERROR) << "Component extension with manifest resource id " 129 LOG(ERROR) << "Component extension with manifest resource id "
129 << manifest_resource_id << " not in whitelist and is not being " 130 << manifest_resource_id << " not in whitelist and is not being "
130 << "loaded as a result."; 131 << "loaded as a result.";
131 NOTREACHED(); 132 NOTREACHED();
132 return false; 133 return false;
133 } 134 }
134 135
135 } // namespace extensions 136 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698