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

Side by Side Diff: chrome/browser/content_settings/content_settings_policy_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: 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/content_settings/content_settings_default_provider.cc ('k') | chrome/browser/content_settings/content_settings_utils.cc » ('j') | chrome/browser/profiles/off_the_record_profile_impl.cc » ('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_policy_provider.h"	5 #include "chrome/browser/content_settings/content_settings_policy_provider.h"

6	6

7 #include <string>	7 #include <string>

8 #include <vector>	8 #include <vector>

9	9

10 #include "base/json/json_reader.h"	10 #include "base/json/json_reader.h"

(...skipping 27 matching lines...) Expand all Loading...
38 NULL, // No policy for default value of mouse lock requests	38 NULL, // No policy for default value of mouse lock requests

39 NULL, // No policy for default value of mixed script blocking	39 NULL, // No policy for default value of mixed script blocking

40 prefs::kManagedDefaultMediaStreamSetting,	40 prefs::kManagedDefaultMediaStreamSetting,

41 NULL, // No policy for default value of media stream mic	41 NULL, // No policy for default value of media stream mic

42 NULL, // No policy for default value of media stream camera	42 NULL, // No policy for default value of media stream camera

43 NULL, // No policy for default value of protocol handlers	43 NULL, // No policy for default value of protocol handlers

44 NULL, // No policy for default value of PPAPI broker	44 NULL, // No policy for default value of PPAPI broker

45 NULL, // No policy for default value of multiple automatic downloads	45 NULL, // No policy for default value of multiple automatic downloads

46 NULL, // No policy for default value of MIDI system exclusive requests	46 NULL, // No policy for default value of MIDI system exclusive requests

47 NULL, // No policy for default value of push messaging requests	47 NULL, // No policy for default value of push messaging requests

	48 NULL, // No policy for default value of SSL certificate decisions

48 #if defined(OS_WIN)	49 #if defined(OS_WIN)

49 NULL, // No policy for default value of "switch to desktop"	50 NULL, // No policy for default value of "switch to desktop"

50 #elif defined(OS_ANDROID) \|\| defined(OS_CHROMEOS)	51 #elif defined(OS_ANDROID) \|\| defined(OS_CHROMEOS)

51 NULL, // No policy for default value of protected media identifier	52 NULL, // No policy for default value of protected media identifier

52 #endif	53 #endif

53 #if defined(OS_ANDROID)	54 #if defined(OS_ANDROID)

54 NULL, // No policy for default value of app banners	55 NULL, // No policy for default value of app banners

55 #endif	56 #endif

56 };	57 };

57 COMPILE_ASSERT(arraysize(kPrefToManageType) == CONTENT_SETTINGS_NUM_TYPES,	58 COMPILE_ASSERT(arraysize(kPrefToManageType) == CONTENT_SETTINGS_NUM_TYPES,

(...skipping 434 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
492 ReadManagedDefaultSettings();	493 ReadManagedDefaultSettings();

493 }	494 }

494	495

495 NotifyObservers(ContentSettingsPattern(),	496 NotifyObservers(ContentSettingsPattern(),

496 ContentSettingsPattern(),	497 ContentSettingsPattern(),

497 CONTENT_SETTINGS_TYPE_DEFAULT,	498 CONTENT_SETTINGS_TYPE_DEFAULT,

498 std::string());	499 std::string());

499 }	500 }

500	501

501 } // namespace content_settings	502 } // namespace content_settings

OLD	NEW