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

Side by Side Diff: chrome/utility/chrome_content_utility_ipc_whitelist.cc

Issue 2479593006: Move enable extensions define to a build flag. (Closed)
Patch Set: Merge Created 4 years, 1 month 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/utility/chrome_content_utility_client.cc ('k') | chrome/utility/extensions/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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/utility/chrome_content_utility_ipc_whitelist.h" 5 #include "chrome/utility/chrome_content_utility_ipc_whitelist.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "extensions/features/features.h"
9 10
10 #if defined(ENABLE_EXTENSIONS) 11 #if BUILDFLAG(ENABLE_EXTENSIONS)
11 #include "chrome/common/extensions/chrome_utility_extensions_messages.h" 12 #include "chrome/common/extensions/chrome_utility_extensions_messages.h"
12 #endif 13 #endif
13 14
14 #if defined(ENABLE_EXTENSIONS) 15 #if BUILDFLAG(ENABLE_EXTENSIONS)
15 const uint32_t kMessageWhitelist[] = { 16 const uint32_t kMessageWhitelist[] = {
16 #if defined(OS_WIN) 17 #if defined(OS_WIN)
17 ChromeUtilityHostMsg_GetWiFiCredentials::ID, 18 ChromeUtilityHostMsg_GetWiFiCredentials::ID,
18 #endif // defined(OS_WIN) 19 #endif // defined(OS_WIN)
19 ChromeUtilityMsg_ImageWriter_Cancel::ID, 20 ChromeUtilityMsg_ImageWriter_Cancel::ID,
20 ChromeUtilityMsg_ImageWriter_Write::ID, 21 ChromeUtilityMsg_ImageWriter_Write::ID,
21 ChromeUtilityMsg_ImageWriter_Verify::ID}; 22 ChromeUtilityMsg_ImageWriter_Verify::ID};
22 const size_t kMessageWhitelistSize = arraysize(kMessageWhitelist); 23 const size_t kMessageWhitelistSize = arraysize(kMessageWhitelist);
23 #else 24 #else
24 // Note: Zero-size arrays are not valid C++. 25 // Note: Zero-size arrays are not valid C++.
25 const uint32_t kMessageWhitelist[] = {0}; 26 const uint32_t kMessageWhitelist[] = {0};
26 const size_t kMessageWhitelistSize = 0; 27 const size_t kMessageWhitelistSize = 0;
27 #endif // defined(ENABLE_EXTENSIONS) 28 #endif // BUILDFLAG(ENABLE_EXTENSIONS)
OLDNEW
« no previous file with comments | « chrome/utility/chrome_content_utility_client.cc ('k') | chrome/utility/extensions/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698