| 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 26 matching lines...) Expand all Loading... |
| 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 "save-password", | 44 "save-password", |
| 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) | 47 #elif defined(OS_ANDROID) || defined(OS_CHROMEOS) |
| 48 "protected-media-identifier", | 48 "protected-media-identifier", |
| 49 #endif | 49 #endif |
| 50 }; | 50 }; |
| 51 COMPILE_ASSERT(arraysize(kTypeNames) == CONTENT_SETTINGS_NUM_TYPES, | 51 COMPILE_ASSERT(arraysize(kTypeNames) == CONTENT_SETTINGS_NUM_TYPES, |
| 52 type_names_incorrect_size); | 52 type_names_incorrect_size); |
| 53 | 53 |
| 54 const char kPatternSeparator[] = ","; | 54 const char kPatternSeparator[] = ","; |
| 55 | 55 |
| 56 } // namespace | 56 } // namespace |
| 57 | 57 |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 195 | 195 |
| 196 void GetRendererContentSettingRules(const HostContentSettingsMap* map, | 196 void GetRendererContentSettingRules(const HostContentSettingsMap* map, |
| 197 RendererContentSettingRules* rules) { | 197 RendererContentSettingRules* rules) { |
| 198 map->GetSettingsForOneType( | 198 map->GetSettingsForOneType( |
| 199 CONTENT_SETTINGS_TYPE_IMAGES, std::string(), &(rules->image_rules)); | 199 CONTENT_SETTINGS_TYPE_IMAGES, std::string(), &(rules->image_rules)); |
| 200 map->GetSettingsForOneType( | 200 map->GetSettingsForOneType( |
| 201 CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string(), &(rules->script_rules)); | 201 CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string(), &(rules->script_rules)); |
| 202 } | 202 } |
| 203 | 203 |
| 204 } // namespace content_settings | 204 } // namespace content_settings |
| OLD | NEW |