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

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

Issue 10826164: Add infobar for PPAPI broker usage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 8 years, 4 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 19 matching lines...) Expand all
30 "popups", 30 "popups",
31 "geolocation", 31 "geolocation",
32 "notifications", 32 "notifications",
33 "intents", 33 "intents",
34 "auto-select-certificate", 34 "auto-select-certificate",
35 "fullscreen", 35 "fullscreen",
36 "mouselock", 36 "mouselock",
37 "mixed-script", 37 "mixed-script",
38 "media-stream", 38 "media-stream",
39 "register-protocol-handler", 39 "register-protocol-handler",
40 "ppapi-broker",
40 }; 41 };
41 COMPILE_ASSERT(arraysize(kTypeNames) == CONTENT_SETTINGS_NUM_TYPES, 42 COMPILE_ASSERT(arraysize(kTypeNames) == CONTENT_SETTINGS_NUM_TYPES,
42 type_names_incorrect_size); 43 type_names_incorrect_size);
43 44
44 const char kPatternSeparator[] = ","; 45 const char kPatternSeparator[] = ",";
45 46
46 } // namespace 47 } // namespace
47 48
48 namespace content_settings { 49 namespace content_settings {
49 50
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 186
186 void GetRendererContentSettingRules(const HostContentSettingsMap* map, 187 void GetRendererContentSettingRules(const HostContentSettingsMap* map,
187 RendererContentSettingRules* rules) { 188 RendererContentSettingRules* rules) {
188 map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_IMAGES, "", 189 map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_IMAGES, "",
189 &(rules->image_rules)); 190 &(rules->image_rules));
190 map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_JAVASCRIPT, "", 191 map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_JAVASCRIPT, "",
191 &(rules->script_rules)); 192 &(rules->script_rules));
192 } 193 }
193 194
194 } // namespace content_settings 195 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698