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

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

Issue 10826164: Add infobar for PPAPI broker usage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix merge 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_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 21 matching lines...) Expand all
32 prefs::kManagedDefaultPopupsSetting, 32 prefs::kManagedDefaultPopupsSetting,
33 prefs::kManagedDefaultGeolocationSetting, 33 prefs::kManagedDefaultGeolocationSetting,
34 prefs::kManagedDefaultNotificationsSetting, 34 prefs::kManagedDefaultNotificationsSetting,
35 NULL, // No policy for default value of content type intents 35 NULL, // No policy for default value of content type intents
36 NULL, // No policy for default value of content type auto-select-certificate 36 NULL, // No policy for default value of content type auto-select-certificate
37 NULL, // No policy for default value of fullscreen requests 37 NULL, // No policy for default value of fullscreen requests
38 NULL, // No policy for default value of mouse lock requests 38 NULL, // No policy for default value of mouse lock requests
39 NULL, // No policy for default value of mixed script blocking 39 NULL, // No policy for default value of mixed script blocking
40 prefs::kManagedDefaultMediaStreamSetting, 40 prefs::kManagedDefaultMediaStreamSetting,
41 NULL, // No policy for default value of protocol handlers 41 NULL, // No policy for default value of protocol handlers
42 NULL, // No policy for default value of PPAPI broker
42 }; 43 };
43 COMPILE_ASSERT(arraysize(kPrefToManageType) == CONTENT_SETTINGS_NUM_TYPES, 44 COMPILE_ASSERT(arraysize(kPrefToManageType) == CONTENT_SETTINGS_NUM_TYPES,
44 managed_content_settings_pref_names_array_size_incorrect); 45 managed_content_settings_pref_names_array_size_incorrect);
45 46
46 struct PrefsForManagedContentSettingsMapEntry { 47 struct PrefsForManagedContentSettingsMapEntry {
47 const char* pref_name; 48 const char* pref_name;
48 ContentSettingsType content_type; 49 ContentSettingsType content_type;
49 ContentSetting setting; 50 ContentSetting setting;
50 }; 51 };
51 52
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 NOTREACHED() << "Unexpected notification"; 467 NOTREACHED() << "Unexpected notification";
467 return; 468 return;
468 } 469 }
469 NotifyObservers(ContentSettingsPattern(), 470 NotifyObservers(ContentSettingsPattern(),
470 ContentSettingsPattern(), 471 ContentSettingsPattern(),
471 CONTENT_SETTINGS_TYPE_DEFAULT, 472 CONTENT_SETTINGS_TYPE_DEFAULT,
472 std::string()); 473 std::string());
473 } 474 }
474 475
475 } // namespace content_settings 476 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698