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

Side by Side Diff: components/content_settings/core/browser/content_settings_policy_provider.cc

Issue 794683005: replace COMPILE_ASSERT with static_assert in components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: formatting fixup Created 6 years 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "components/content_settings/core/browser/content_settings_policy_provi der.h" 5 #include "components/content_settings/core/browser/content_settings_policy_provi der.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 NULL, // No policy for default value of SSL certificate decisions 43 NULL, // No policy for default value of SSL certificate decisions
44 #if defined(OS_WIN) 44 #if defined(OS_WIN)
45 NULL, // No policy for default value of "switch to desktop" 45 NULL, // No policy for default value of "switch to desktop"
46 #elif defined(OS_ANDROID) || defined(OS_CHROMEOS) 46 #elif defined(OS_ANDROID) || defined(OS_CHROMEOS)
47 NULL, // No policy for default value of protected media identifier 47 NULL, // No policy for default value of protected media identifier
48 #endif 48 #endif
49 #if defined(OS_ANDROID) 49 #if defined(OS_ANDROID)
50 NULL, // No policy for default value of app banners 50 NULL, // No policy for default value of app banners
51 #endif 51 #endif
52 }; 52 };
53 COMPILE_ASSERT(arraysize(kPrefToManageType) == CONTENT_SETTINGS_NUM_TYPES, 53 static_assert(arraysize(kPrefToManageType) == CONTENT_SETTINGS_NUM_TYPES,
54 managed_content_settings_pref_names_array_size_incorrect); 54 "kPrefToManageType should have CONTENT_SETTINGS_NUM_TYPES "
55 "elements");
55 56
56 struct PrefsForManagedContentSettingsMapEntry { 57 struct PrefsForManagedContentSettingsMapEntry {
57 const char* pref_name; 58 const char* pref_name;
58 ContentSettingsType content_type; 59 ContentSettingsType content_type;
59 ContentSetting setting; 60 ContentSetting setting;
60 }; 61 };
61 62
62 const PrefsForManagedContentSettingsMapEntry 63 const PrefsForManagedContentSettingsMapEntry
63 kPrefsForManagedContentSettingsMap[] = { 64 kPrefsForManagedContentSettingsMap[] = {
64 { 65 {
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 ReadManagedDefaultSettings(); 487 ReadManagedDefaultSettings();
487 } 488 }
488 489
489 NotifyObservers(ContentSettingsPattern(), 490 NotifyObservers(ContentSettingsPattern(),
490 ContentSettingsPattern(), 491 ContentSettingsPattern(),
491 CONTENT_SETTINGS_TYPE_DEFAULT, 492 CONTENT_SETTINGS_TYPE_DEFAULT,
492 std::string()); 493 std::string());
493 } 494 }
494 495
495 } // namespace content_settings 496 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698