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

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

Issue 10537099: add "always allow" option to the mediastream infobar and allow user to allow/not allow acces to devi (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Check the exceptions before the default setting, sites in the exceptions list can access the device… Created 8 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 15 matching lines...) Expand all
26 "cookies", 26 "cookies",
27 "images", 27 "images",
28 "javascript", 28 "javascript",
29 "plugins", 29 "plugins",
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 "media-stream"
37 }; 38 };
38 COMPILE_ASSERT(arraysize(kTypeNames) == CONTENT_SETTINGS_NUM_TYPES, 39 COMPILE_ASSERT(arraysize(kTypeNames) == CONTENT_SETTINGS_NUM_TYPES,
39 type_names_incorrect_size); 40 type_names_incorrect_size);
40 41
41 const char kPatternSeparator[] = ","; 42 const char kPatternSeparator[] = ",";
42 43
43 } // namespace 44 } // namespace
44 45
45 namespace content_settings { 46 namespace content_settings {
46 47
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 183
183 void GetRendererContentSettingRules(const HostContentSettingsMap* map, 184 void GetRendererContentSettingRules(const HostContentSettingsMap* map,
184 RendererContentSettingRules* rules) { 185 RendererContentSettingRules* rules) {
185 map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_IMAGES, "", 186 map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_IMAGES, "",
186 &(rules->image_rules)); 187 &(rules->image_rules));
187 map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_JAVASCRIPT, "", 188 map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_JAVASCRIPT, "",
188 &(rules->script_rules)); 189 &(rules->script_rules));
189 } 190 }
190 191
191 } // namespace content_settings 192 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698