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

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

Issue 2760403003: Remove enable_media_router. (Closed)
Patch Set: Created 3 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
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"
(...skipping 14 matching lines...) Expand all
25 #include "ui/file_manager/grit/file_manager_resources.h" 25 #include "ui/file_manager/grit/file_manager_resources.h"
26 #include "ui/keyboard/grit/keyboard_resources.h" 26 #include "ui/keyboard/grit/keyboard_resources.h"
27 #endif 27 #endif
28 28
29 namespace extensions { 29 namespace extensions {
30 30
31 bool IsComponentExtensionWhitelisted(const std::string& extension_id) { 31 bool IsComponentExtensionWhitelisted(const std::string& extension_id) {
32 const char* const kAllowed[] = { 32 const char* const kAllowed[] = {
33 extension_misc::kHotwordSharedModuleId, 33 extension_misc::kHotwordSharedModuleId,
34 extension_misc::kInAppPaymentsSupportAppId, 34 extension_misc::kInAppPaymentsSupportAppId,
35 #if defined(ENABLE_MEDIA_ROUTER)
36 extension_misc::kMediaRouterStableExtensionId, 35 extension_misc::kMediaRouterStableExtensionId,
37 #endif // defined(ENABLE_MEDIA_ROUTER)
38 extension_misc::kPdfExtensionId, 36 extension_misc::kPdfExtensionId,
39 #if defined(OS_CHROMEOS) 37 #if defined(OS_CHROMEOS)
40 extension_misc::kChromeVoxExtensionId, 38 extension_misc::kChromeVoxExtensionId,
41 extension_misc::kSelectToSpeakExtensionId, 39 extension_misc::kSelectToSpeakExtensionId,
42 extension_misc::kSpeechSynthesisExtensionId, 40 extension_misc::kSpeechSynthesisExtensionId,
43 extension_misc::kSwitchAccessExtensionId, 41 extension_misc::kSwitchAccessExtensionId,
44 extension_misc::kZIPUnpackerExtensionId, 42 extension_misc::kZIPUnpackerExtensionId,
45 #endif 43 #endif
46 }; 44 };
47 45
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 } 124 }
127 125
128 LOG(ERROR) << "Component extension with manifest resource id " 126 LOG(ERROR) << "Component extension with manifest resource id "
129 << manifest_resource_id << " not in whitelist and is not being " 127 << manifest_resource_id << " not in whitelist and is not being "
130 << "loaded as a result."; 128 << "loaded as a result.";
131 NOTREACHED(); 129 NOTREACHED();
132 return false; 130 return false;
133 } 131 }
134 132
135 } // namespace extensions 133 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698