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 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
198 | 199 |
199 void GetRendererContentSettingRules(const HostContentSettingsMap* map, | 200 void GetRendererContentSettingRules(const HostContentSettingsMap* map, |
200 RendererContentSettingRules* rules) { | 201 RendererContentSettingRules* rules) { |
201 map->GetSettingsForOneType( | 202 map->GetSettingsForOneType( |
202 CONTENT_SETTINGS_TYPE_IMAGES, std::string(), &(rules->image_rules)); | 203 CONTENT_SETTINGS_TYPE_IMAGES, std::string(), &(rules->image_rules)); |
203 map->GetSettingsForOneType( | 204 map->GetSettingsForOneType( |
204 CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string(), &(rules->script_rules)); | 205 CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string(), &(rules->script_rules)); |
205 } | 206 } |
206 | 207 |
207 } // namespace content_settings | 208 } // namespace content_settings |
OLD | NEW |