| 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 "components/content_settings/core/browser/content_settings_default_prov
ider.h" | 5 #include "components/content_settings/core/browser/content_settings_default_prov
ider.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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_PPAPI_BROKER | 44 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_PPAPI_BROKER |
| 45 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS | 45 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS |
| 46 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MIDI_SYSEX | 46 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MIDI_SYSEX |
| 47 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_PUSH_MESSAGING | 47 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_PUSH_MESSAGING |
| 48 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS | 48 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS |
| 49 #if defined(OS_WIN) | 49 #if defined(OS_WIN) |
| 50 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP | 50 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP |
| 51 #elif defined(OS_ANDROID) || defined(OS_CHROMEOS) | 51 #elif defined(OS_ANDROID) || defined(OS_CHROMEOS) |
| 52 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER | 52 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER |
| 53 #endif | 53 #endif |
| 54 #if defined(OS_ANDROID) | |
| 55 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_APP_BANNER | 54 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_APP_BANNER |
| 56 #endif | |
| 57 }; | 55 }; |
| 58 static_assert(arraysize(kDefaultSettings) == CONTENT_SETTINGS_NUM_TYPES, | 56 static_assert(arraysize(kDefaultSettings) == CONTENT_SETTINGS_NUM_TYPES, |
| 59 "kDefaultSettings should have CONTENT_SETTINGS_NUM_TYPES " | 57 "kDefaultSettings should have CONTENT_SETTINGS_NUM_TYPES " |
| 60 "elements"); | 58 "elements"); |
| 61 | 59 |
| 62 } // namespace | 60 } // namespace |
| 63 | 61 |
| 64 namespace content_settings { | 62 namespace content_settings { |
| 65 | 63 |
| 66 namespace { | 64 namespace { |
| (...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 // Migrate obsolete cookie prompt mode. | 330 // Migrate obsolete cookie prompt mode. |
| 333 if (ValueToContentSetting( | 331 if (ValueToContentSetting( |
| 334 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].get()) == | 332 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].get()) == |
| 335 CONTENT_SETTING_ASK) { | 333 CONTENT_SETTING_ASK) { |
| 336 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].reset( | 334 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].reset( |
| 337 new base::FundamentalValue(CONTENT_SETTING_BLOCK)); | 335 new base::FundamentalValue(CONTENT_SETTING_BLOCK)); |
| 338 } | 336 } |
| 339 } | 337 } |
| 340 | 338 |
| 341 } // namespace content_settings | 339 } // namespace content_settings |
| OLD | NEW |