| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 325 switch (content_type) { | 325 switch (content_type) { |
| 326 case CONTENT_SETTINGS_TYPE_COOKIES: | 326 case CONTENT_SETTINGS_TYPE_COOKIES: |
| 327 return setting == CONTENT_SETTING_SESSION_ONLY; | 327 return setting == CONTENT_SETTING_SESSION_ONLY; |
| 328 case CONTENT_SETTINGS_TYPE_PLUGINS: | 328 case CONTENT_SETTINGS_TYPE_PLUGINS: |
| 329 return setting == CONTENT_SETTING_ASK && | 329 return setting == CONTENT_SETTING_ASK && |
| 330 CommandLine::ForCurrentProcess()->HasSwitch( | 330 CommandLine::ForCurrentProcess()->HasSwitch( |
| 331 switches::kEnableClickToPlay); | 331 switches::kEnableClickToPlay); |
| 332 case CONTENT_SETTINGS_TYPE_GEOLOCATION: | 332 case CONTENT_SETTINGS_TYPE_GEOLOCATION: |
| 333 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: | 333 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: |
| 334 case CONTENT_SETTINGS_TYPE_INTENTS: | 334 case CONTENT_SETTINGS_TYPE_INTENTS: |
| 335 case CONTENT_SETTINGS_TYPE_MOUSELOCK: |
| 335 return setting == CONTENT_SETTING_ASK; | 336 return setting == CONTENT_SETTING_ASK; |
| 336 default: | 337 default: |
| 337 return false; | 338 return false; |
| 338 } | 339 } |
| 339 } | 340 } |
| 340 | 341 |
| 341 void HostContentSettingsMap::OnContentSettingChanged( | 342 void HostContentSettingsMap::OnContentSettingChanged( |
| 342 ContentSettingsPattern primary_pattern, | 343 ContentSettingsPattern primary_pattern, |
| 343 ContentSettingsPattern secondary_pattern, | 344 ContentSettingsPattern secondary_pattern, |
| 344 ContentSettingsType content_type, | 345 ContentSettingsType content_type, |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 450 } | 451 } |
| 451 } | 452 } |
| 452 | 453 |
| 453 if (info) { | 454 if (info) { |
| 454 info->source = content_settings::SETTING_SOURCE_NONE; | 455 info->source = content_settings::SETTING_SOURCE_NONE; |
| 455 info->primary_pattern = ContentSettingsPattern(); | 456 info->primary_pattern = ContentSettingsPattern(); |
| 456 info->secondary_pattern = ContentSettingsPattern(); | 457 info->secondary_pattern = ContentSettingsPattern(); |
| 457 } | 458 } |
| 458 return NULL; | 459 return NULL; |
| 459 } | 460 } |
| OLD | NEW |