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

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

Issue 7713034: HostContentSettingsMap refactoring. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Code review comments. Threading fixes. Mac + win fixes. Created 9 years, 3 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/command_line.h" 10 #include "base/command_line.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 kPrefsForManagedContentSettingsMap[] = { 46 kPrefsForManagedContentSettingsMap[] = {
47 { 47 {
48 prefs::kManagedAutoSelectCertificateForUrls, 48 prefs::kManagedAutoSelectCertificateForUrls,
49 CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE, 49 CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE,
50 CONTENT_SETTING_ALLOW 50 CONTENT_SETTING_ALLOW
51 }, { 51 }, {
52 prefs::kManagedCookiesAllowedForUrls, 52 prefs::kManagedCookiesAllowedForUrls,
53 CONTENT_SETTINGS_TYPE_COOKIES, 53 CONTENT_SETTINGS_TYPE_COOKIES,
54 CONTENT_SETTING_ALLOW 54 CONTENT_SETTING_ALLOW
55 }, { 55 }, {
56 prefs::kManagedCookiesAllowedForUrls,
57 CONTENT_SETTINGS_TYPE_COOKIES_SESSION_ONLY,
58 CONTENT_SETTING_ALLOW
59 }, {
60 prefs::kManagedCookiesSessionOnlyForUrls,
61 CONTENT_SETTINGS_TYPE_COOKIES,
62 CONTENT_SETTING_ALLOW
63 }, {
56 prefs::kManagedCookiesSessionOnlyForUrls, 64 prefs::kManagedCookiesSessionOnlyForUrls,
57 CONTENT_SETTINGS_TYPE_COOKIES, 65 CONTENT_SETTINGS_TYPE_COOKIES_SESSION_ONLY,
58 CONTENT_SETTING_SESSION_ONLY 66 CONTENT_SETTING_SESSION_ONLY
59 }, { 67 }, {
60 prefs::kManagedCookiesBlockedForUrls, 68 prefs::kManagedCookiesBlockedForUrls,
61 CONTENT_SETTINGS_TYPE_COOKIES, 69 CONTENT_SETTINGS_TYPE_COOKIES,
62 CONTENT_SETTING_BLOCK 70 CONTENT_SETTING_BLOCK
63 }, { 71 }, {
64 prefs::kManagedImagesAllowedForUrls, 72 prefs::kManagedImagesAllowedForUrls,
65 CONTENT_SETTINGS_TYPE_IMAGES, 73 CONTENT_SETTINGS_TYPE_IMAGES,
66 CONTENT_SETTING_ALLOW 74 CONTENT_SETTING_ALLOW
67 }, { 75 }, {
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 ContentSettingsPattern(), 475 ContentSettingsPattern(),
468 CONTENT_SETTINGS_TYPE_DEFAULT, 476 CONTENT_SETTINGS_TYPE_DEFAULT,
469 std::string()); 477 std::string());
470 } 478 }
471 } else { 479 } else {
472 NOTREACHED() << "Unexpected notification"; 480 NOTREACHED() << "Unexpected notification";
473 } 481 }
474 } 482 }
475 483
476 } // namespace content_settings 484 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698