chrome/browser/content_settings/content_settings_default_provider.cc - Issue 343743004: Implement a permission check for push.

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

Issue 343743004: Implement a permission check for push. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased and addressed Michael's comments Created 6 years, 6 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

« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/content_settings/content_settings_policy_provider.cc » ('j') | chrome/browser/content_settings/permission_queue_controller.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_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 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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_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 #if defined(OS_WIN)	55 #if defined(OS_WIN)

55 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP	56 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP

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

57 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER	58 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER

58 #endif	59 #endif

59 #if defined(OS_ANDROID)	60 #if defined(OS_ANDROID)

60 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_APP_BANNER	61 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_APP_BANNER

61 #endif	62 #endif

62 };	63 };

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

(...skipping 269 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
333 // Migrate obsolete cookie prompt mode.	334 // Migrate obsolete cookie prompt mode.

334 if (ValueToContentSetting(	335 if (ValueToContentSetting(

335 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].get()) ==	336 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].get()) ==

336 CONTENT_SETTING_ASK) {	337 CONTENT_SETTING_ASK) {

337 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].reset(	338 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].reset(

338 base::Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));	339 base::Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));

339 }	340 }

340 }	341 }

341	342

342 } // namespace content_settings	343 } // namespace content_settings

OLD	NEW