chrome/browser/content_settings/content_settings_default_provider.cc - Issue 369703002: Remember user decisions on invalid certificates behind a flag

Side by Side Diff: chrome/browser/content_settings/content_settings_default_provider.cc

Issue 369703002: Remember user decisions on invalid certificates behind a flag (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: More fixes from sleevi plus a rebase on ToT Created 6 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« chrome/browser/browsing_data/browsing_data_remover.cc ('K') | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/content_settings/content_settings_policy_provider.cc » ('j') | chrome/browser/ssl/chrome_ssl_host_state_decisions.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 34 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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_MEDIASTREAM	47 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MEDIASTREAM

48 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC	48 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC

49 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA	49 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA

50 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS	50 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS

51 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_PPAPI_BROKER	51 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_PPAPI_BROKER

52 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS	52 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS

53 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MIDI_SYSEX	53 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MIDI_SYSEX

54 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_PUSH_MESSAGING	54 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_PUSH_MESSAGING

	55 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS

55 #if defined(OS_WIN)	56 #if defined(OS_WIN)

56 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP	57 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP

57 #elif defined(OS_ANDROID) \|\| defined(OS_CHROMEOS)	58 #elif defined(OS_ANDROID) \|\| defined(OS_CHROMEOS)

58 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER	59 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER

59 #endif	60 #endif

60 #if defined(OS_ANDROID)	61 #if defined(OS_ANDROID)

61 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_APP_BANNER	62 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_APP_BANNER

62 #endif	63 #endif

63 };	64 };

64 COMPILE_ASSERT(arraysize(kDefaultSettings) == CONTENT_SETTINGS_NUM_TYPES,	65 COMPILE_ASSERT(arraysize(kDefaultSettings) == CONTENT_SETTINGS_NUM_TYPES,

(...skipping 271 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
336 // Migrate obsolete cookie prompt mode.	337 // Migrate obsolete cookie prompt mode.

337 if (ValueToContentSetting(	338 if (ValueToContentSetting(

338 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].get()) ==	339 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].get()) ==

339 CONTENT_SETTING_ASK) {	340 CONTENT_SETTING_ASK) {

340 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].reset(	341 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].reset(

341 base::Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));	342 base::Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));

342 }	343 }

343 }	344 }

344	345

345 } // namespace content_settings	346 } // namespace content_settings

OLD	NEW