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

Side by Side Diff: components/content_settings/core/common/content_settings_types.h

Issue 884373002: Update content setting for app banners to store more information. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac test failure Created 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_TYPES_H_ 5 #ifndef COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_TYPES_H_
6 #define COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_TYPES_H_ 6 #define COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_TYPES_H_
7 7
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 9
10 // A particular type of content to care about. We give the user various types 10 // A particular type of content to care about. We give the user various types
(...skipping 28 matching lines...) Expand all
39 CONTENT_SETTINGS_TYPE_PPAPI_BROKER, 39 CONTENT_SETTINGS_TYPE_PPAPI_BROKER,
40 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, 40 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS,
41 CONTENT_SETTINGS_TYPE_MIDI_SYSEX, 41 CONTENT_SETTINGS_TYPE_MIDI_SYSEX,
42 CONTENT_SETTINGS_TYPE_PUSH_MESSAGING, 42 CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,
43 CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS, 43 CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS,
44 #if defined(OS_WIN) 44 #if defined(OS_WIN)
45 CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP, 45 CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP,
46 #elif defined(OS_ANDROID) || defined(OS_CHROMEOS) 46 #elif defined(OS_ANDROID) || defined(OS_CHROMEOS)
47 CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER, 47 CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,
48 #endif 48 #endif
49 #if defined(OS_ANDROID)
50 CONTENT_SETTINGS_TYPE_APP_BANNER, 49 CONTENT_SETTINGS_TYPE_APP_BANNER,
51 #endif
52 CONTENT_SETTINGS_NUM_TYPES, 50 CONTENT_SETTINGS_NUM_TYPES,
53 }; 51 };
54 52
55 // There should be a corresponding enum value for each content settings type 53 // There should be a corresponding enum value for each content settings type
56 // above, except that this list is OS-independent and has the same number of 54 // above, except that this list is OS-independent and has the same number of
57 // values on all platforms (and is hence safe to record in a histogram). 55 // values on all platforms (and is hence safe to record in a histogram).
58 // Do not remove or reorder existing entries - they are used in histograms.xml. 56 // Do not remove or reorder existing entries - they are used in histograms.xml.
59 enum ContentSettingsTypeHistogram { 57 enum ContentSettingsTypeHistogram {
60 CONTENT_SETTINGS_TYPE_HISTOGRAM_INVALID = -1, 58 CONTENT_SETTINGS_TYPE_HISTOGRAM_INVALID = -1,
61 CONTENT_SETTINGS_TYPE_HISTOGRAM_COOKIES = 0, 59 CONTENT_SETTINGS_TYPE_HISTOGRAM_COOKIES = 0,
(...skipping 16 matching lines...) Expand all
78 CONTENT_SETTINGS_TYPE_HISTOGRAM_MIDI_SYSEX, 76 CONTENT_SETTINGS_TYPE_HISTOGRAM_MIDI_SYSEX,
79 CONTENT_SETTINGS_TYPE_HISTOGRAM_PUSH_MESSAGING, 77 CONTENT_SETTINGS_TYPE_HISTOGRAM_PUSH_MESSAGING,
80 CONTENT_SETTINGS_TYPE_HISTOGRAM_SSL_CERT_DECISIONS, 78 CONTENT_SETTINGS_TYPE_HISTOGRAM_SSL_CERT_DECISIONS,
81 CONTENT_SETTINGS_TYPE_HISTOGRAM_METRO_SWITCH_TO_DESKTOP, 79 CONTENT_SETTINGS_TYPE_HISTOGRAM_METRO_SWITCH_TO_DESKTOP,
82 CONTENT_SETTINGS_TYPE_HISTOGRAM_PROTECTED_MEDIA_IDENTIFIER, 80 CONTENT_SETTINGS_TYPE_HISTOGRAM_PROTECTED_MEDIA_IDENTIFIER,
83 CONTENT_SETTINGS_TYPE_HISTOGRAM_APP_BANNER, 81 CONTENT_SETTINGS_TYPE_HISTOGRAM_APP_BANNER,
84 CONTENT_SETTINGS_HISTOGRAM_NUM_TYPES, 82 CONTENT_SETTINGS_HISTOGRAM_NUM_TYPES,
85 }; 83 };
86 84
87 #endif // COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_TYPES_H_ 85 #endif // COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_TYPES_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698