Chromium Code Reviews| 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_default_provider.h" | 5 #include "chrome/browser/content_settings/content_settings_default_provider.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 26 matching lines...) Expand all Loading... | |
| 37 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_JAVASCRIPT | 37 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_JAVASCRIPT |
| 38 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_PLUGINS | 38 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_PLUGINS |
| 39 CONTENT_SETTING_BLOCK, // CONTENT_SETTINGS_TYPE_POPUPS | 39 CONTENT_SETTING_BLOCK, // CONTENT_SETTINGS_TYPE_POPUPS |
| 40 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_GEOLOCATION | 40 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_GEOLOCATION |
| 41 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_NOTIFICATIONS | 41 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_NOTIFICATIONS |
| 42 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_INTENTS | 42 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_INTENTS |
| 43 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE | 43 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE |
| 44 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_FULLSCREEN | 44 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_FULLSCREEN |
| 45 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MOUSELOCK | 45 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MOUSELOCK |
| 46 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_MIXEDSCRIPT | 46 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_MIXEDSCRIPT |
| 47 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_REGISTER_PROTOCOL_HANDLER | |
|
Bernhard Bauer
2012/06/25 16:52:20
Do we actually store content settings for this typ
Greg Billock
2012/06/26 19:17:04
No, we're not storing them. Fixed.
| |
| 47 }; | 48 }; |
| 48 COMPILE_ASSERT(arraysize(kDefaultSettings) == CONTENT_SETTINGS_NUM_TYPES, | 49 COMPILE_ASSERT(arraysize(kDefaultSettings) == CONTENT_SETTINGS_NUM_TYPES, |
| 49 default_settings_incorrect_size); | 50 default_settings_incorrect_size); |
| 50 | 51 |
| 51 } // namespace | 52 } // namespace |
| 52 | 53 |
| 53 namespace content_settings { | 54 namespace content_settings { |
| 54 | 55 |
| 55 namespace { | 56 namespace { |
| 56 | 57 |
| (...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 378 SetWebsiteSetting( | 379 SetWebsiteSetting( |
| 379 ContentSettingsPattern::Wildcard(), | 380 ContentSettingsPattern::Wildcard(), |
| 380 ContentSettingsPattern::Wildcard(), | 381 ContentSettingsPattern::Wildcard(), |
| 381 CONTENT_SETTINGS_TYPE_GEOLOCATION, | 382 CONTENT_SETTINGS_TYPE_GEOLOCATION, |
| 382 std::string(), | 383 std::string(), |
| 383 value->DeepCopy()); | 384 value->DeepCopy()); |
| 384 } | 385 } |
| 385 } | 386 } |
| 386 | 387 |
| 387 } // namespace content_settings | 388 } // namespace content_settings |
| OLD | NEW |