components/content_settings/core/browser/content_settings_policy_provider.cc - Issue 884373002: Update content setting for app banners to store more information.

Side by Side Diff: components/content_settings/core/browser/content_settings_policy_provider.cc

Issue 884373002: Update content setting for app banners to store more information. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Mac test failure Created 5 years, 10 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

« chrome/browser/banners/app_banner_settings_helper.h ('K') | « components/content_settings/core/browser/content_settings_default_provider.cc ('k') | components/content_settings/core/browser/content_settings_utils.cc » ('j') | no next file with comments »
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 "components/content_settings/core/browser/content_settings_policy_provi der.h"	5 #include "components/content_settings/core/browser/content_settings_policy_provi der.h"

6	6

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

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

9	9

10 #include "base/bind.h"	10 #include "base/bind.h"

(...skipping 28 matching lines...) Expand all Loading...
39 NULL, // No policy for default value of PPAPI broker	39 NULL, // No policy for default value of PPAPI broker

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

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

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

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

44 #if defined(OS_WIN)	44 #if defined(OS_WIN)

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

46 #elif defined(OS_ANDROID) \|\| defined(OS_CHROMEOS)	46 #elif defined(OS_ANDROID) \|\| defined(OS_CHROMEOS)

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

48 #endif	48 #endif

49 #if defined(OS_ANDROID)

50 NULL, // No policy for default value of app banners	49 NULL, // No policy for default value of app banners

51 #endif

52 };	50 };

53 static_assert(arraysize(kPrefToManageType) == CONTENT_SETTINGS_NUM_TYPES,	51 static_assert(arraysize(kPrefToManageType) == CONTENT_SETTINGS_NUM_TYPES,

54 "kPrefToManageType should have CONTENT_SETTINGS_NUM_TYPES "	52 "kPrefToManageType should have CONTENT_SETTINGS_NUM_TYPES "

55 "elements");	53 "elements");

56	54

57 struct PrefsForManagedContentSettingsMapEntry {	55 struct PrefsForManagedContentSettingsMapEntry {

58 const char* pref_name;	56 const char* pref_name;

59 ContentSettingsType content_type;	57 ContentSettingsType content_type;

60 ContentSetting setting;	58 ContentSetting setting;

61 };	59 };

(...skipping 425 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
487 ReadManagedDefaultSettings();	485 ReadManagedDefaultSettings();

488 }	486 }

489	487

490 NotifyObservers(ContentSettingsPattern(),	488 NotifyObservers(ContentSettingsPattern(),

491 ContentSettingsPattern(),	489 ContentSettingsPattern(),

492 CONTENT_SETTINGS_TYPE_DEFAULT,	490 CONTENT_SETTINGS_TYPE_DEFAULT,

493 std::string());	491 std::string());

494 }	492 }

495	493

496 } // namespace content_settings	494 } // namespace content_settings

OLD	NEW