| 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 "chrome/browser/content_settings/content_settings_utils.h" | 5 #include "chrome/browser/content_settings/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 24 matching lines...) Expand all Loading... |
| 35 "mouselock", | 35 "mouselock", |
| 36 "mixed-script", | 36 "mixed-script", |
| 37 "media-stream", | 37 "media-stream", |
| 38 "media-stream-mic", | 38 "media-stream-mic", |
| 39 "media-stream-camera", | 39 "media-stream-camera", |
| 40 "register-protocol-handler", | 40 "register-protocol-handler", |
| 41 "ppapi-broker", | 41 "ppapi-broker", |
| 42 "multiple-automatic-downloads", | 42 "multiple-automatic-downloads", |
| 43 "midi-sysex", | 43 "midi-sysex", |
| 44 "push-messaging", | 44 "push-messaging", |
| 45 "ssl-cert-decisions", |
| 45 #if defined(OS_WIN) | 46 #if defined(OS_WIN) |
| 46 "metro-switch-to-desktop", | 47 "metro-switch-to-desktop", |
| 47 #elif defined(OS_ANDROID) || defined(OS_CHROMEOS) | 48 #elif defined(OS_ANDROID) || defined(OS_CHROMEOS) |
| 48 "protected-media-identifier", | 49 "protected-media-identifier", |
| 49 #endif | 50 #endif |
| 50 #if defined(OS_ANDROID) | 51 #if defined(OS_ANDROID) |
| 51 "app-banner", | 52 "app-banner", |
| 52 #endif | 53 #endif |
| 53 }; | 54 }; |
| 54 COMPILE_ASSERT(arraysize(kTypeNames) == CONTENT_SETTINGS_NUM_TYPES, | 55 COMPILE_ASSERT(arraysize(kTypeNames) == CONTENT_SETTINGS_NUM_TYPES, |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 | 210 |
| 210 void GetRendererContentSettingRules(const HostContentSettingsMap* map, | 211 void GetRendererContentSettingRules(const HostContentSettingsMap* map, |
| 211 RendererContentSettingRules* rules) { | 212 RendererContentSettingRules* rules) { |
| 212 map->GetSettingsForOneType( | 213 map->GetSettingsForOneType( |
| 213 CONTENT_SETTINGS_TYPE_IMAGES, std::string(), &(rules->image_rules)); | 214 CONTENT_SETTINGS_TYPE_IMAGES, std::string(), &(rules->image_rules)); |
| 214 map->GetSettingsForOneType( | 215 map->GetSettingsForOneType( |
| 215 CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string(), &(rules->script_rules)); | 216 CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string(), &(rules->script_rules)); |
| 216 } | 217 } |
| 217 | 218 |
| 218 } // namespace content_settings | 219 } // namespace content_settings |
| OLD | NEW |