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

Side by Side Diff: components/content_settings/core/common/content_settings.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 (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 "components/content_settings/core/common/content_settings.h" 5 #include "components/content_settings/core/common/content_settings.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 8
9 ContentSetting IntToContentSetting(int content_setting) { 9 ContentSetting IntToContentSetting(int content_setting) {
10 return ((content_setting < 0) || 10 return ((content_setting < 0) ||
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 case CONTENT_SETTINGS_TYPE_PPAPI_BROKER: 50 case CONTENT_SETTINGS_TYPE_PPAPI_BROKER:
51 return CONTENT_SETTINGS_TYPE_HISTOGRAM_PPAPI_BROKER; 51 return CONTENT_SETTINGS_TYPE_HISTOGRAM_PPAPI_BROKER;
52 case CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS: 52 case CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS:
53 return CONTENT_SETTINGS_TYPE_HISTOGRAM_AUTOMATIC_DOWNLOADS; 53 return CONTENT_SETTINGS_TYPE_HISTOGRAM_AUTOMATIC_DOWNLOADS;
54 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX: 54 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
55 return CONTENT_SETTINGS_TYPE_HISTOGRAM_MIDI_SYSEX; 55 return CONTENT_SETTINGS_TYPE_HISTOGRAM_MIDI_SYSEX;
56 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: 56 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
57 return CONTENT_SETTINGS_TYPE_HISTOGRAM_PUSH_MESSAGING; 57 return CONTENT_SETTINGS_TYPE_HISTOGRAM_PUSH_MESSAGING;
58 case CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS: 58 case CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS:
59 return CONTENT_SETTINGS_TYPE_HISTOGRAM_SSL_CERT_DECISIONS; 59 return CONTENT_SETTINGS_TYPE_HISTOGRAM_SSL_CERT_DECISIONS;
60 #if defined(OS_WIN) 60 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
61 case CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP:
62 return CONTENT_SETTINGS_TYPE_HISTOGRAM_METRO_SWITCH_TO_DESKTOP;
63 #elif defined(OS_ANDROID) || defined(OS_CHROMEOS)
64 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER: 61 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
65 return CONTENT_SETTINGS_TYPE_HISTOGRAM_PROTECTED_MEDIA_IDENTIFIER; 62 return CONTENT_SETTINGS_TYPE_HISTOGRAM_PROTECTED_MEDIA_IDENTIFIER;
66 #endif 63 #endif
67 case CONTENT_SETTINGS_TYPE_APP_BANNER: 64 case CONTENT_SETTINGS_TYPE_APP_BANNER:
68 return CONTENT_SETTINGS_TYPE_HISTOGRAM_APP_BANNER; 65 return CONTENT_SETTINGS_TYPE_HISTOGRAM_APP_BANNER;
69 case CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT: 66 case CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT:
70 return CONTENT_SETTINGS_TYPE_HISTOGRAM_SITE_ENGAGEMENT; 67 return CONTENT_SETTINGS_TYPE_HISTOGRAM_SITE_ENGAGEMENT;
71 case CONTENT_SETTINGS_TYPE_DURABLE_STORAGE: 68 case CONTENT_SETTINGS_TYPE_DURABLE_STORAGE:
72 return CONTENT_SETTINGS_TYPE_HISTOGRAM_DURABLE_STORAGE; 69 return CONTENT_SETTINGS_TYPE_HISTOGRAM_DURABLE_STORAGE;
73 case CONTENT_SETTINGS_NUM_TYPES: 70 case CONTENT_SETTINGS_NUM_TYPES:
(...skipping 10 matching lines...) Expand all
84 case CONTENT_SETTINGS_TYPE_JAVASCRIPT: 81 case CONTENT_SETTINGS_TYPE_JAVASCRIPT:
85 case CONTENT_SETTINGS_TYPE_PLUGINS: 82 case CONTENT_SETTINGS_TYPE_PLUGINS:
86 case CONTENT_SETTINGS_TYPE_POPUPS: 83 case CONTENT_SETTINGS_TYPE_POPUPS:
87 case CONTENT_SETTINGS_TYPE_FULLSCREEN: 84 case CONTENT_SETTINGS_TYPE_FULLSCREEN:
88 case CONTENT_SETTINGS_TYPE_MOUSELOCK: 85 case CONTENT_SETTINGS_TYPE_MOUSELOCK:
89 case CONTENT_SETTINGS_TYPE_MIXEDSCRIPT: 86 case CONTENT_SETTINGS_TYPE_MIXEDSCRIPT:
90 case CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS: 87 case CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS:
91 case CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS: 88 case CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS:
92 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX: 89 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
93 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: 90 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
94 #if defined(OS_WIN)
95 case CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP:
96 #endif
97 return true; 91 return true;
98 92
99 case CONTENT_SETTINGS_TYPE_GEOLOCATION: 93 case CONTENT_SETTINGS_TYPE_GEOLOCATION:
100 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: 94 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
101 case CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE: 95 case CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE:
102 case CONTENT_SETTINGS_TYPE_MEDIASTREAM: 96 case CONTENT_SETTINGS_TYPE_MEDIASTREAM:
103 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC: 97 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:
104 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA: 98 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA:
105 case CONTENT_SETTINGS_TYPE_PPAPI_BROKER: 99 case CONTENT_SETTINGS_TYPE_PPAPI_BROKER:
106 case CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS: 100 case CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS:
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 source(source), 132 source(source),
139 incognito(incognito) {} 133 incognito(incognito) {}
140 134
141 ContentSettingPatternSource::ContentSettingPatternSource() 135 ContentSettingPatternSource::ContentSettingPatternSource()
142 : setting(CONTENT_SETTING_DEFAULT), incognito(false) { 136 : setting(CONTENT_SETTING_DEFAULT), incognito(false) {
143 } 137 }
144 138
145 RendererContentSettingRules::RendererContentSettingRules() {} 139 RendererContentSettingRules::RendererContentSettingRules() {}
146 140
147 RendererContentSettingRules::~RendererContentSettingRules() {} 141 RendererContentSettingRules::~RendererContentSettingRules() {}
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698