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/host_content_settings_map.h" | 5 #include "chrome/browser/content_settings/host_content_settings_map.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
351 } | 351 } |
352 switch (content_type) { | 352 switch (content_type) { |
353 case CONTENT_SETTINGS_TYPE_COOKIES: | 353 case CONTENT_SETTINGS_TYPE_COOKIES: |
354 return setting == CONTENT_SETTING_SESSION_ONLY; | 354 return setting == CONTENT_SETTING_SESSION_ONLY; |
355 case CONTENT_SETTINGS_TYPE_PLUGINS: | 355 case CONTENT_SETTINGS_TYPE_PLUGINS: |
356 case CONTENT_SETTINGS_TYPE_GEOLOCATION: | 356 case CONTENT_SETTINGS_TYPE_GEOLOCATION: |
357 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: | 357 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: |
358 case CONTENT_SETTINGS_TYPE_INTENTS: | 358 case CONTENT_SETTINGS_TYPE_INTENTS: |
359 case CONTENT_SETTINGS_TYPE_MOUSELOCK: | 359 case CONTENT_SETTINGS_TYPE_MOUSELOCK: |
360 case CONTENT_SETTINGS_TYPE_MEDIASTREAM: | 360 case CONTENT_SETTINGS_TYPE_MEDIASTREAM: |
| 361 case CONTENT_SETTINGS_TYPE_PPAPI_BROKER: |
361 return setting == CONTENT_SETTING_ASK; | 362 return setting == CONTENT_SETTING_ASK; |
362 default: | 363 default: |
363 return false; | 364 return false; |
364 } | 365 } |
365 } | 366 } |
366 | 367 |
367 // static | 368 // static |
368 bool HostContentSettingsMap::ContentTypeHasCompoundValue( | 369 bool HostContentSettingsMap::ContentTypeHasCompoundValue( |
369 ContentSettingsType type) { | 370 ContentSettingsType type) { |
370 // Values for content type CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE are | 371 // Values for content type CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE are |
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
554 } | 555 } |
555 } | 556 } |
556 | 557 |
557 if (info) { | 558 if (info) { |
558 info->source = content_settings::SETTING_SOURCE_NONE; | 559 info->source = content_settings::SETTING_SOURCE_NONE; |
559 info->primary_pattern = ContentSettingsPattern(); | 560 info->primary_pattern = ContentSettingsPattern(); |
560 info->secondary_pattern = ContentSettingsPattern(); | 561 info->secondary_pattern = ContentSettingsPattern(); |
561 } | 562 } |
562 return NULL; | 563 return NULL; |
563 } | 564 } |
OLD | NEW |