| OLD | NEW |
| 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_utils.h" | 5 #include "components/content_settings/core/browser/content_settings_utils.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 "ppapi-broker", | 40 "ppapi-broker", |
| 41 "multiple-automatic-downloads", | 41 "multiple-automatic-downloads", |
| 42 "midi-sysex", | 42 "midi-sysex", |
| 43 "push-messaging", | 43 "push-messaging", |
| 44 "ssl-cert-decisions", | 44 "ssl-cert-decisions", |
| 45 #if defined(OS_WIN) | 45 #if defined(OS_WIN) |
| 46 "metro-switch-to-desktop", | 46 "metro-switch-to-desktop", |
| 47 #elif defined(OS_ANDROID) || defined(OS_CHROMEOS) | 47 #elif defined(OS_ANDROID) || defined(OS_CHROMEOS) |
| 48 "protected-media-identifier", | 48 "protected-media-identifier", |
| 49 #endif | 49 #endif |
| 50 #if defined(OS_ANDROID) | |
| 51 "app-banner", | 50 "app-banner", |
| 52 #endif | |
| 53 }; | 51 }; |
| 54 static_assert(arraysize(kTypeNames) == CONTENT_SETTINGS_NUM_TYPES, | 52 static_assert(arraysize(kTypeNames) == CONTENT_SETTINGS_NUM_TYPES, |
| 55 "kTypeNames should have CONTENT_SETTINGS_NUM_TYPES elements"); | 53 "kTypeNames should have CONTENT_SETTINGS_NUM_TYPES elements"); |
| 56 | 54 |
| 57 const char kPatternSeparator[] = ","; | 55 const char kPatternSeparator[] = ","; |
| 58 | 56 |
| 59 } // namespace | 57 } // namespace |
| 60 | 58 |
| 61 namespace content_settings { | 59 namespace content_settings { |
| 62 | 60 |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 222 | 220 |
| 223 void GetRendererContentSettingRules(const HostContentSettingsMap* map, | 221 void GetRendererContentSettingRules(const HostContentSettingsMap* map, |
| 224 RendererContentSettingRules* rules) { | 222 RendererContentSettingRules* rules) { |
| 225 map->GetSettingsForOneType( | 223 map->GetSettingsForOneType( |
| 226 CONTENT_SETTINGS_TYPE_IMAGES, std::string(), &(rules->image_rules)); | 224 CONTENT_SETTINGS_TYPE_IMAGES, std::string(), &(rules->image_rules)); |
| 227 map->GetSettingsForOneType( | 225 map->GetSettingsForOneType( |
| 228 CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string(), &(rules->script_rules)); | 226 CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string(), &(rules->script_rules)); |
| 229 } | 227 } |
| 230 | 228 |
| 231 } // namespace content_settings | 229 } // namespace content_settings |
| OLD | NEW |