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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 12225076: Delete most web intents code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 10 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
« no previous file with comments | « chrome/browser/chromeos/extensions/file_browser_private_api.cc ('k') | chrome/browser/content_settings/content_settings_policy_provider.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_default_provider.h" 5 #include "chrome/browser/content_settings/content_settings_default_provider.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 22 matching lines...) Expand all
33 33
34 // The default setting for each content type. 34 // The default setting for each content type.
35 const ContentSetting kDefaultSettings[] = { 35 const ContentSetting kDefaultSettings[] = {
36 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_COOKIES 36 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_COOKIES
37 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_IMAGES 37 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_IMAGES
38 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_JAVASCRIPT 38 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_JAVASCRIPT
39 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_PLUGINS 39 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_PLUGINS
40 CONTENT_SETTING_BLOCK, // CONTENT_SETTINGS_TYPE_POPUPS 40 CONTENT_SETTING_BLOCK, // CONTENT_SETTINGS_TYPE_POPUPS
41 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_GEOLOCATION 41 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_GEOLOCATION
42 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_NOTIFICATIONS 42 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_NOTIFICATIONS
43 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_INTENTS
44 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE 43 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE
45 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_FULLSCREEN 44 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_FULLSCREEN
46 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MOUSELOCK 45 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MOUSELOCK
47 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_MIXEDSCRIPT 46 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_MIXEDSCRIPT
48 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MEDIASTREAM 47 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MEDIASTREAM
49 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC 48 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC
50 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA 49 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA
51 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS 50 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS
52 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_PPAPI_BROKER 51 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_PPAPI_BROKER
53 #if defined(OS_WIN) 52 #if defined(OS_WIN)
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 "ContentSettings.DefaultLocationSetting", 138 "ContentSettings.DefaultLocationSetting",
140 ValueToContentSetting( 139 ValueToContentSetting(
141 default_settings_[CONTENT_SETTINGS_TYPE_GEOLOCATION].get()), 140 default_settings_[CONTENT_SETTINGS_TYPE_GEOLOCATION].get()),
142 CONTENT_SETTING_NUM_SETTINGS); 141 CONTENT_SETTING_NUM_SETTINGS);
143 UMA_HISTOGRAM_ENUMERATION( 142 UMA_HISTOGRAM_ENUMERATION(
144 "ContentSettings.DefaultNotificationsSetting", 143 "ContentSettings.DefaultNotificationsSetting",
145 ValueToContentSetting( 144 ValueToContentSetting(
146 default_settings_[CONTENT_SETTINGS_TYPE_NOTIFICATIONS].get()), 145 default_settings_[CONTENT_SETTINGS_TYPE_NOTIFICATIONS].get()),
147 CONTENT_SETTING_NUM_SETTINGS); 146 CONTENT_SETTING_NUM_SETTINGS);
148 UMA_HISTOGRAM_ENUMERATION( 147 UMA_HISTOGRAM_ENUMERATION(
149 "ContentSettings.DefaultHandlersSetting",
150 ValueToContentSetting(
151 default_settings_[CONTENT_SETTINGS_TYPE_INTENTS].get()),
152 CONTENT_SETTING_NUM_SETTINGS);
153 UMA_HISTOGRAM_ENUMERATION(
154 "ContentSettings.DefaultMouseCursorSetting", 148 "ContentSettings.DefaultMouseCursorSetting",
155 ValueToContentSetting( 149 ValueToContentSetting(
156 default_settings_[CONTENT_SETTINGS_TYPE_MOUSELOCK].get()), 150 default_settings_[CONTENT_SETTINGS_TYPE_MOUSELOCK].get()),
157 CONTENT_SETTING_NUM_SETTINGS); 151 CONTENT_SETTING_NUM_SETTINGS);
158 UMA_HISTOGRAM_ENUMERATION( 152 UMA_HISTOGRAM_ENUMERATION(
159 "ContentSettings.DefaultMediaStreamSetting", 153 "ContentSettings.DefaultMediaStreamSetting",
160 ValueToContentSetting( 154 ValueToContentSetting(
161 default_settings_[CONTENT_SETTINGS_TYPE_MEDIASTREAM].get()), 155 default_settings_[CONTENT_SETTINGS_TYPE_MEDIASTREAM].get()),
162 CONTENT_SETTING_NUM_SETTINGS); 156 CONTENT_SETTING_NUM_SETTINGS);
163 157
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 // Migrate obsolete cookie prompt mode. 320 // Migrate obsolete cookie prompt mode.
327 if (ValueToContentSetting( 321 if (ValueToContentSetting(
328 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].get()) == 322 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].get()) ==
329 CONTENT_SETTING_ASK) { 323 CONTENT_SETTING_ASK) {
330 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].reset( 324 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].reset(
331 Value::CreateIntegerValue(CONTENT_SETTING_BLOCK)); 325 Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
332 } 326 }
333 } 327 }
334 328
335 } // namespace content_settings 329 } // namespace content_settings
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/extensions/file_browser_private_api.cc ('k') | chrome/browser/content_settings/content_settings_policy_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698