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

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

Issue 31043008: Changed platform verification user consent logic to be per-domain. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix browser_tests Created 7 years, 1 month 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_policy_provider.h" 5 #include "chrome/browser/content_settings/content_settings_policy_provider.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/json/json_reader.h" 10 #include "base/json/json_reader.h"
(...skipping 29 matching lines...) Expand all
40 prefs::kManagedDefaultMediaStreamSetting, 40 prefs::kManagedDefaultMediaStreamSetting,
41 NULL, // No policy for default value of media stream mic 41 NULL, // No policy for default value of media stream mic
42 NULL, // No policy for default value of media stream camera 42 NULL, // No policy for default value of media stream camera
43 NULL, // No policy for default value of protocol handlers 43 NULL, // No policy for default value of protocol handlers
44 NULL, // No policy for default value of PPAPI broker 44 NULL, // No policy for default value of PPAPI broker
45 NULL, // No policy for default value of multiple automatic downloads 45 NULL, // No policy for default value of multiple automatic downloads
46 NULL, // No policy for default value of MIDI system exclusive requests 46 NULL, // No policy for default value of MIDI system exclusive requests
47 NULL, // No policy for default value of save password 47 NULL, // No policy for default value of save password
48 #if defined(OS_WIN) 48 #if defined(OS_WIN)
49 NULL, // No policy for default value of "switch to desktop" 49 NULL, // No policy for default value of "switch to desktop"
50 #elif defined(OS_ANDROID) 50 #elif defined(OS_ANDROID) || defined(OS_CHROMEOS)
51 NULL, // No policy for default value of protected media identifier 51 NULL, // No policy for default value of protected media identifier
52 #endif 52 #endif
53 }; 53 };
54 COMPILE_ASSERT(arraysize(kPrefToManageType) == CONTENT_SETTINGS_NUM_TYPES, 54 COMPILE_ASSERT(arraysize(kPrefToManageType) == CONTENT_SETTINGS_NUM_TYPES,
55 managed_content_settings_pref_names_array_size_incorrect); 55 managed_content_settings_pref_names_array_size_incorrect);
56 56
57 struct PrefsForManagedContentSettingsMapEntry { 57 struct PrefsForManagedContentSettingsMapEntry {
58 const char* pref_name; 58 const char* pref_name;
59 ContentSettingsType content_type; 59 ContentSettingsType content_type;
60 ContentSetting setting; 60 ContentSetting setting;
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 ReadManagedDefaultSettings(); 486 ReadManagedDefaultSettings();
487 } 487 }
488 488
489 NotifyObservers(ContentSettingsPattern(), 489 NotifyObservers(ContentSettingsPattern(),
490 ContentSettingsPattern(), 490 ContentSettingsPattern(),
491 CONTENT_SETTINGS_TYPE_DEFAULT, 491 CONTENT_SETTINGS_TYPE_DEFAULT,
492 std::string()); 492 std::string());
493 } 493 }
494 494
495 } // namespace content_settings 495 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698