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

Side by Side Diff: components/content_settings/core/browser/website_settings_registry.cc

Issue 1274383002: Remove deprecated CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP content setting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "components/content_settings/core/browser/website_settings_registry.h" 5 #include "components/content_settings/core/browser/website_settings_registry.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "components/content_settings/core/common/content_settings.h" 9 #include "components/content_settings/core/common/content_settings.h"
10 10
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 RegisterWebsiteSetting(CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE, 78 RegisterWebsiteSetting(CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE,
79 "auto-select-certificate"); 79 "auto-select-certificate");
80 RegisterWebsiteSetting(CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS, 80 RegisterWebsiteSetting(CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS,
81 "ssl-cert-decisions"); 81 "ssl-cert-decisions");
82 RegisterWebsiteSetting(CONTENT_SETTINGS_TYPE_APP_BANNER, "app-banner"); 82 RegisterWebsiteSetting(CONTENT_SETTINGS_TYPE_APP_BANNER, "app-banner");
83 RegisterWebsiteSetting(CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT, 83 RegisterWebsiteSetting(CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT,
84 "site-engagement"); 84 "site-engagement");
85 85
86 // Deprecated. 86 // Deprecated.
87 RegisterWebsiteSetting(CONTENT_SETTINGS_TYPE_MEDIASTREAM, "media-stream"); 87 RegisterWebsiteSetting(CONTENT_SETTINGS_TYPE_MEDIASTREAM, "media-stream");
88 #if defined(OS_WIN)
89 RegisterContentSetting(CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP,
90 "metro-switch-to-desktop", CONTENT_SETTING_ASK);
91 #endif
92 } 88 }
93 89
94 WebsiteSettingsRegistry::~WebsiteSettingsRegistry() {} 90 WebsiteSettingsRegistry::~WebsiteSettingsRegistry() {}
95 91
96 const WebsiteSettingsInfo* WebsiteSettingsRegistry::Get( 92 const WebsiteSettingsInfo* WebsiteSettingsRegistry::Get(
97 ContentSettingsType type) const { 93 ContentSettingsType type) const {
98 DCHECK_GE(type, 0); 94 DCHECK_GE(type, 0);
99 DCHECK_LT(type, static_cast<int>(website_settings_info_.size())); 95 DCHECK_LT(type, static_cast<int>(website_settings_info_.size()));
100 return website_settings_info_[type]; 96 return website_settings_info_[type];
101 } 97 }
(...skipping 23 matching lines...) Expand all
125 } 121 }
126 122
127 void WebsiteSettingsRegistry::StoreWebsiteSettingsInfo( 123 void WebsiteSettingsRegistry::StoreWebsiteSettingsInfo(
128 WebsiteSettingsInfo* info) { 124 WebsiteSettingsInfo* info) {
129 DCHECK_GE(info->type(), 0); 125 DCHECK_GE(info->type(), 0);
130 DCHECK_LT(info->type(), static_cast<int>(website_settings_info_.size())); 126 DCHECK_LT(info->type(), static_cast<int>(website_settings_info_.size()));
131 website_settings_info_[info->type()] = info; 127 website_settings_info_[info->type()] = info;
132 } 128 }
133 129
134 } // namespace content_settings 130 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698