| 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 17 matching lines...) Expand all  Loading... | 
|   28   "javascript", |   28   "javascript", | 
|   29   "plugins", |   29   "plugins", | 
|   30   "popups", |   30   "popups", | 
|   31   "geolocation", |   31   "geolocation", | 
|   32   "notifications", |   32   "notifications", | 
|   33   "intents", |   33   "intents", | 
|   34   "auto-select-certificate", |   34   "auto-select-certificate", | 
|   35   "fullscreen", |   35   "fullscreen", | 
|   36   "mouselock", |   36   "mouselock", | 
|   37   "mixed-script", |   37   "mixed-script", | 
|   38   "media-stream" |   38   "media-stream", | 
 |   39   "register-protocol-handler", | 
|   39 }; |   40 }; | 
|   40 COMPILE_ASSERT(arraysize(kTypeNames) == CONTENT_SETTINGS_NUM_TYPES, |   41 COMPILE_ASSERT(arraysize(kTypeNames) == CONTENT_SETTINGS_NUM_TYPES, | 
|   41                type_names_incorrect_size); |   42                type_names_incorrect_size); | 
|   42  |   43  | 
|   43 const char kPatternSeparator[] = ","; |   44 const char kPatternSeparator[] = ","; | 
|   44  |   45  | 
|   45 }  // namespace |   46 }  // namespace | 
|   46  |   47  | 
|   47 namespace content_settings { |   48 namespace content_settings { | 
|   48  |   49  | 
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  184  |  185  | 
|  185 void GetRendererContentSettingRules(const HostContentSettingsMap* map, |  186 void GetRendererContentSettingRules(const HostContentSettingsMap* map, | 
|  186                                     RendererContentSettingRules* rules) { |  187                                     RendererContentSettingRules* rules) { | 
|  187   map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_IMAGES, "", |  188   map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_IMAGES, "", | 
|  188                              &(rules->image_rules)); |  189                              &(rules->image_rules)); | 
|  189   map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_JAVASCRIPT, "", |  190   map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_JAVASCRIPT, "", | 
|  190                              &(rules->script_rules)); |  191                              &(rules->script_rules)); | 
|  191 } |  192 } | 
|  192  |  193  | 
|  193 }  // namespace content_settings |  194 }  // namespace content_settings | 
| OLD | NEW |