OLD | NEW |
---|---|
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 CONTENT_PUBLIC_COMMON_WEB_PREFERENCES_H_ | 5 #ifndef CONTENT_PUBLIC_COMMON_WEB_PREFERENCES_H_ |
6 #define CONTENT_PUBLIC_COMMON_WEB_PREFERENCES_H_ | 6 #define CONTENT_PUBLIC_COMMON_WEB_PREFERENCES_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
60 // effects. | 60 // effects. |
61 enum class ProgressBarCompletion { | 61 enum class ProgressBarCompletion { |
62 LOAD_EVENT, | 62 LOAD_EVENT, |
63 RESOURCES_BEFORE_DCL, | 63 RESOURCES_BEFORE_DCL, |
64 DOM_CONTENT_LOADED, | 64 DOM_CONTENT_LOADED, |
65 RESOURCES_BEFORE_DCL_AND_SAME_ORIGIN_IFRAMES, | 65 RESOURCES_BEFORE_DCL_AND_SAME_ORIGIN_IFRAMES, |
66 LAST = RESOURCES_BEFORE_DCL_AND_SAME_ORIGIN_IFRAMES | 66 LAST = RESOURCES_BEFORE_DCL_AND_SAME_ORIGIN_IFRAMES |
67 }; | 67 }; |
68 | 68 |
69 // Defines the autoplay policy to be used. Should match the class in | 69 // Defines the autoplay policy to be used. Should match the class in |
70 // WebSettings.h. | 70 // WebSettings.h. |
nasko
2017/06/05 23:48:11
note: It would've been best if WebSettings.h chang
mlamouri (slow - plz ping)
2017/06/06 08:49:31
FWIW, the changes were split on purpose so I could
| |
71 enum class AutoplayPolicy { | 71 enum class AutoplayPolicy { |
72 kNoUserGestureRequired, | 72 kNoUserGestureRequired, |
73 kUserGestureRequired, | 73 kUserGestureRequired, |
74 kUserGestureRequiredForCrossOrigin, | 74 kUserGestureRequiredForCrossOrigin, |
75 kDocumentUserActivationRequired, | |
75 }; | 76 }; |
76 | 77 |
77 // The ISO 15924 script code for undetermined script aka Common. It's the | 78 // The ISO 15924 script code for undetermined script aka Common. It's the |
78 // default used on WebKit's side to get/set a font setting when no script is | 79 // default used on WebKit's side to get/set a font setting when no script is |
79 // specified. | 80 // specified. |
80 CONTENT_EXPORT extern const char kCommonScript[]; | 81 CONTENT_EXPORT extern const char kCommonScript[]; |
81 | 82 |
82 // A struct for managing blink's settings. | 83 // A struct for managing blink's settings. |
83 // | 84 // |
84 // Adding new values to this class probably involves updating | 85 // Adding new values to this class probably involves updating |
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
301 // chrome, except for the cases where it would require lots of extra work for | 302 // chrome, except for the cases where it would require lots of extra work for |
302 // the embedder to use the same default value. | 303 // the embedder to use the same default value. |
303 WebPreferences(); | 304 WebPreferences(); |
304 WebPreferences(const WebPreferences& other); | 305 WebPreferences(const WebPreferences& other); |
305 ~WebPreferences(); | 306 ~WebPreferences(); |
306 }; | 307 }; |
307 | 308 |
308 } // namespace content | 309 } // namespace content |
309 | 310 |
310 #endif // CONTENT_PUBLIC_COMMON_WEB_PREFERENCES_H_ | 311 #endif // CONTENT_PUBLIC_COMMON_WEB_PREFERENCES_H_ |
OLD | NEW |