Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(481)

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

Issue 343743004: Implement a permission check for push. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add content settings html sections 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
OLDNEW
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_utils.h" 5 #include "chrome/browser/content_settings/content_settings_utils.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 23 matching lines...) Expand all
34 "fullscreen", 34 "fullscreen",
35 "mouselock", 35 "mouselock",
36 "mixed-script", 36 "mixed-script",
37 "media-stream", 37 "media-stream",
38 "media-stream-mic", 38 "media-stream-mic",
39 "media-stream-camera", 39 "media-stream-camera",
40 "register-protocol-handler", 40 "register-protocol-handler",
41 "ppapi-broker", 41 "ppapi-broker",
42 "multiple-automatic-downloads", 42 "multiple-automatic-downloads",
43 "midi-sysex", 43 "midi-sysex",
44 "push-messaging",
44 #if defined(OS_WIN) 45 #if defined(OS_WIN)
45 "metro-switch-to-desktop", 46 "metro-switch-to-desktop",
46 #elif defined(OS_ANDROID) || defined(OS_CHROMEOS) 47 #elif defined(OS_ANDROID) || defined(OS_CHROMEOS)
47 "protected-media-identifier", 48 "protected-media-identifier",
48 #endif 49 #endif
49 #if defined(OS_ANDROID) 50 #if defined(OS_ANDROID)
50 "app-banner", 51 "app-banner",
51 #endif 52 #endif
52 }; 53 };
53 COMPILE_ASSERT(arraysize(kTypeNames) == CONTENT_SETTINGS_NUM_TYPES, 54 COMPILE_ASSERT(arraysize(kTypeNames) == CONTENT_SETTINGS_NUM_TYPES,
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 198
198 void GetRendererContentSettingRules(const HostContentSettingsMap* map, 199 void GetRendererContentSettingRules(const HostContentSettingsMap* map,
199 RendererContentSettingRules* rules) { 200 RendererContentSettingRules* rules) {
200 map->GetSettingsForOneType( 201 map->GetSettingsForOneType(
201 CONTENT_SETTINGS_TYPE_IMAGES, std::string(), &(rules->image_rules)); 202 CONTENT_SETTINGS_TYPE_IMAGES, std::string(), &(rules->image_rules));
202 map->GetSettingsForOneType( 203 map->GetSettingsForOneType(
203 CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string(), &(rules->script_rules)); 204 CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string(), &(rules->script_rules));
204 } 205 }
205 206
206 } // namespace content_settings 207 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698