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

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: . 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') | chrome/browser/extensions/api/app_runtime/app_runtime_api.h » ('J')
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 21 matching lines...) Expand all
32 32
33 // The default setting for each content type. 33 // The default setting for each content type.
34 const ContentSetting kDefaultSettings[] = { 34 const ContentSetting kDefaultSettings[] = {
35 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_COOKIES 35 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_COOKIES
36 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_IMAGES 36 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_IMAGES
37 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_JAVASCRIPT 37 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_JAVASCRIPT
38 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_PLUGINS 38 CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_PLUGINS
39 CONTENT_SETTING_BLOCK, // CONTENT_SETTINGS_TYPE_POPUPS 39 CONTENT_SETTING_BLOCK, // CONTENT_SETTINGS_TYPE_POPUPS
40 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_GEOLOCATION 40 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_GEOLOCATION
41 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_NOTIFICATIONS 41 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_NOTIFICATIONS
42 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_INTENTS
43 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE 42 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE
44 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_FULLSCREEN 43 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_FULLSCREEN
45 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MOUSELOCK 44 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MOUSELOCK
46 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_MIXEDSCRIPT 45 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_MIXEDSCRIPT
47 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MEDIASTREAM 46 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MEDIASTREAM
48 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC 47 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC
49 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA 48 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA
50 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS 49 CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS
51 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_PPAPI_BROKER 50 CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_PPAPI_BROKER
52 #if defined(OS_WIN) 51 #if defined(OS_WIN)
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 "ContentSettings.DefaultLocationSetting", 137 "ContentSettings.DefaultLocationSetting",
139 ValueToContentSetting( 138 ValueToContentSetting(
140 default_settings_[CONTENT_SETTINGS_TYPE_GEOLOCATION].get()), 139 default_settings_[CONTENT_SETTINGS_TYPE_GEOLOCATION].get()),
141 CONTENT_SETTING_NUM_SETTINGS); 140 CONTENT_SETTING_NUM_SETTINGS);
142 UMA_HISTOGRAM_ENUMERATION( 141 UMA_HISTOGRAM_ENUMERATION(
143 "ContentSettings.DefaultNotificationsSetting", 142 "ContentSettings.DefaultNotificationsSetting",
144 ValueToContentSetting( 143 ValueToContentSetting(
145 default_settings_[CONTENT_SETTINGS_TYPE_NOTIFICATIONS].get()), 144 default_settings_[CONTENT_SETTINGS_TYPE_NOTIFICATIONS].get()),
146 CONTENT_SETTING_NUM_SETTINGS); 145 CONTENT_SETTING_NUM_SETTINGS);
147 UMA_HISTOGRAM_ENUMERATION( 146 UMA_HISTOGRAM_ENUMERATION(
148 "ContentSettings.DefaultHandlersSetting",
149 ValueToContentSetting(
150 default_settings_[CONTENT_SETTINGS_TYPE_INTENTS].get()),
151 CONTENT_SETTING_NUM_SETTINGS);
152 UMA_HISTOGRAM_ENUMERATION(
153 "ContentSettings.DefaultMouseCursorSetting", 147 "ContentSettings.DefaultMouseCursorSetting",
154 ValueToContentSetting( 148 ValueToContentSetting(
155 default_settings_[CONTENT_SETTINGS_TYPE_MOUSELOCK].get()), 149 default_settings_[CONTENT_SETTINGS_TYPE_MOUSELOCK].get()),
156 CONTENT_SETTING_NUM_SETTINGS); 150 CONTENT_SETTING_NUM_SETTINGS);
157 UMA_HISTOGRAM_ENUMERATION( 151 UMA_HISTOGRAM_ENUMERATION(
158 "ContentSettings.DefaultMediaStreamSetting", 152 "ContentSettings.DefaultMediaStreamSetting",
159 ValueToContentSetting( 153 ValueToContentSetting(
160 default_settings_[CONTENT_SETTINGS_TYPE_MEDIASTREAM].get()), 154 default_settings_[CONTENT_SETTINGS_TYPE_MEDIASTREAM].get()),
161 CONTENT_SETTING_NUM_SETTINGS); 155 CONTENT_SETTING_NUM_SETTINGS);
162 156
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 // Migrate obsolete cookie prompt mode. 319 // Migrate obsolete cookie prompt mode.
326 if (ValueToContentSetting( 320 if (ValueToContentSetting(
327 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].get()) == 321 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].get()) ==
328 CONTENT_SETTING_ASK) { 322 CONTENT_SETTING_ASK) {
329 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].reset( 323 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].reset(
330 Value::CreateIntegerValue(CONTENT_SETTING_BLOCK)); 324 Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
331 } 325 }
332 } 326 }
333 327
334 } // namespace content_settings 328 } // 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') | chrome/browser/extensions/api/app_runtime/app_runtime_api.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698