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

Side by Side Diff: content/public/common/common_param_traits_macros.h

Issue 1860743002: Add a flag to change when android's progress bar completes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix a bad merge Created 4 years, 6 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) 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 // Singly or Multiply-included shared traits file depending on circumstances. 5 // Singly or Multiply-included shared traits file depending on circumstances.
6 // This allows the use of IPC serialization macros in more than one IPC message 6 // This allows the use of IPC serialization macros in more than one IPC message
7 // file. 7 // file.
8 #ifndef CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_ 8 #ifndef CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_
9 #define CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_ 9 #define CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_
10 10
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 blink::WebReferrerPolicyLast) 52 blink::WebReferrerPolicyLast)
53 IPC_ENUM_TRAITS_MAX_VALUE(blink::mojom::PermissionStatus, 53 IPC_ENUM_TRAITS_MAX_VALUE(blink::mojom::PermissionStatus,
54 blink::mojom::PermissionStatus::LAST) 54 blink::mojom::PermissionStatus::LAST)
55 IPC_ENUM_TRAITS_MAX_VALUE(content::EditingBehavior, 55 IPC_ENUM_TRAITS_MAX_VALUE(content::EditingBehavior,
56 content::EDITING_BEHAVIOR_LAST) 56 content::EDITING_BEHAVIOR_LAST)
57 IPC_ENUM_TRAITS_MAX_VALUE(WindowOpenDisposition, 57 IPC_ENUM_TRAITS_MAX_VALUE(WindowOpenDisposition,
58 WINDOW_OPEN_DISPOSITION_LAST) 58 WINDOW_OPEN_DISPOSITION_LAST)
59 IPC_ENUM_TRAITS_MAX_VALUE(net::RequestPriority, net::MAXIMUM_PRIORITY) 59 IPC_ENUM_TRAITS_MAX_VALUE(net::RequestPriority, net::MAXIMUM_PRIORITY)
60 IPC_ENUM_TRAITS_MAX_VALUE(content::V8CacheOptions, 60 IPC_ENUM_TRAITS_MAX_VALUE(content::V8CacheOptions,
61 content::V8_CACHE_OPTIONS_LAST) 61 content::V8_CACHE_OPTIONS_LAST)
62 #if defined(OS_ANDROID)
63 IPC_ENUM_TRAITS_MAX_VALUE(content::ProgressBarCompletion,
64 content::ProgressBarCompletion::LAST)
65 #endif
62 IPC_ENUM_TRAITS_MIN_MAX_VALUE(ui::PointerType, 66 IPC_ENUM_TRAITS_MIN_MAX_VALUE(ui::PointerType,
63 ui::POINTER_TYPE_FIRST, 67 ui::POINTER_TYPE_FIRST,
64 ui::POINTER_TYPE_LAST) 68 ui::POINTER_TYPE_LAST)
65 IPC_ENUM_TRAITS_MIN_MAX_VALUE(ui::HoverType, 69 IPC_ENUM_TRAITS_MIN_MAX_VALUE(ui::HoverType,
66 ui::HOVER_TYPE_FIRST, 70 ui::HOVER_TYPE_FIRST,
67 ui::HOVER_TYPE_LAST) 71 ui::HOVER_TYPE_LAST)
68 IPC_ENUM_TRAITS_MIN_MAX_VALUE(content::ImageAnimationPolicy, 72 IPC_ENUM_TRAITS_MIN_MAX_VALUE(content::ImageAnimationPolicy,
69 content::IMAGE_ANIMATION_POLICY_ALLOWED, 73 content::IMAGE_ANIMATION_POLICY_ALLOWED,
70 content::IMAGE_ANIMATION_POLICY_NO_ANIMATION) 74 content::IMAGE_ANIMATION_POLICY_NO_ANIMATION)
71 IPC_ENUM_TRAITS_MIN_MAX_VALUE(content::ViewportStyle, 75 IPC_ENUM_TRAITS_MIN_MAX_VALUE(content::ViewportStyle,
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 IPC_STRUCT_TRAITS_MEMBER(force_zero_layout_height) 235 IPC_STRUCT_TRAITS_MEMBER(force_zero_layout_height)
232 IPC_STRUCT_TRAITS_MEMBER(viewport_meta_layout_size_quirk) 236 IPC_STRUCT_TRAITS_MEMBER(viewport_meta_layout_size_quirk)
233 IPC_STRUCT_TRAITS_MEMBER(viewport_meta_merge_content_quirk) 237 IPC_STRUCT_TRAITS_MEMBER(viewport_meta_merge_content_quirk)
234 IPC_STRUCT_TRAITS_MEMBER(viewport_meta_non_user_scalable_quirk) 238 IPC_STRUCT_TRAITS_MEMBER(viewport_meta_non_user_scalable_quirk)
235 IPC_STRUCT_TRAITS_MEMBER(viewport_meta_zero_values_quirk) 239 IPC_STRUCT_TRAITS_MEMBER(viewport_meta_zero_values_quirk)
236 IPC_STRUCT_TRAITS_MEMBER(clobber_user_agent_initial_scale_quirk) 240 IPC_STRUCT_TRAITS_MEMBER(clobber_user_agent_initial_scale_quirk)
237 IPC_STRUCT_TRAITS_MEMBER(ignore_main_frame_overflow_hidden_quirk) 241 IPC_STRUCT_TRAITS_MEMBER(ignore_main_frame_overflow_hidden_quirk)
238 IPC_STRUCT_TRAITS_MEMBER(report_screen_size_in_physical_pixels_quirk) 242 IPC_STRUCT_TRAITS_MEMBER(report_screen_size_in_physical_pixels_quirk)
239 IPC_STRUCT_TRAITS_MEMBER(resue_global_for_unowned_main_frame) 243 IPC_STRUCT_TRAITS_MEMBER(resue_global_for_unowned_main_frame)
240 IPC_STRUCT_TRAITS_MEMBER(autoplay_muted_videos_enabled) 244 IPC_STRUCT_TRAITS_MEMBER(autoplay_muted_videos_enabled)
245 IPC_STRUCT_TRAITS_MEMBER(progress_bar_completion)
241 #endif 246 #endif
242 IPC_STRUCT_TRAITS_MEMBER(autoplay_experiment_mode) 247 IPC_STRUCT_TRAITS_MEMBER(autoplay_experiment_mode)
243 IPC_STRUCT_TRAITS_MEMBER(default_minimum_page_scale_factor) 248 IPC_STRUCT_TRAITS_MEMBER(default_minimum_page_scale_factor)
244 IPC_STRUCT_TRAITS_MEMBER(default_maximum_page_scale_factor) 249 IPC_STRUCT_TRAITS_MEMBER(default_maximum_page_scale_factor)
245 IPC_STRUCT_TRAITS_END() 250 IPC_STRUCT_TRAITS_END()
246 251
247 IPC_STRUCT_TRAITS_BEGIN(blink::WebWindowFeatures) 252 IPC_STRUCT_TRAITS_BEGIN(blink::WebWindowFeatures)
248 IPC_STRUCT_TRAITS_MEMBER(x) 253 IPC_STRUCT_TRAITS_MEMBER(x)
249 IPC_STRUCT_TRAITS_MEMBER(xSet) 254 IPC_STRUCT_TRAITS_MEMBER(xSet)
250 IPC_STRUCT_TRAITS_MEMBER(y) 255 IPC_STRUCT_TRAITS_MEMBER(y)
(...skipping 15 matching lines...) Expand all
266 IPC_ENUM_TRAITS_MAX_VALUE(ui::AXEvent, ui::AX_EVENT_LAST) 271 IPC_ENUM_TRAITS_MAX_VALUE(ui::AXEvent, ui::AX_EVENT_LAST)
267 IPC_ENUM_TRAITS_MAX_VALUE(ui::AXRole, ui::AX_ROLE_LAST) 272 IPC_ENUM_TRAITS_MAX_VALUE(ui::AXRole, ui::AX_ROLE_LAST)
268 IPC_ENUM_TRAITS_MAX_VALUE(ui::AXBoolAttribute, ui::AX_BOOL_ATTRIBUTE_LAST) 273 IPC_ENUM_TRAITS_MAX_VALUE(ui::AXBoolAttribute, ui::AX_BOOL_ATTRIBUTE_LAST)
269 IPC_ENUM_TRAITS_MAX_VALUE(ui::AXFloatAttribute, ui::AX_FLOAT_ATTRIBUTE_LAST) 274 IPC_ENUM_TRAITS_MAX_VALUE(ui::AXFloatAttribute, ui::AX_FLOAT_ATTRIBUTE_LAST)
270 IPC_ENUM_TRAITS_MAX_VALUE(ui::AXIntAttribute, ui::AX_INT_ATTRIBUTE_LAST) 275 IPC_ENUM_TRAITS_MAX_VALUE(ui::AXIntAttribute, ui::AX_INT_ATTRIBUTE_LAST)
271 IPC_ENUM_TRAITS_MAX_VALUE(ui::AXIntListAttribute, 276 IPC_ENUM_TRAITS_MAX_VALUE(ui::AXIntListAttribute,
272 ui::AX_INT_LIST_ATTRIBUTE_LAST) 277 ui::AX_INT_LIST_ATTRIBUTE_LAST)
273 IPC_ENUM_TRAITS_MAX_VALUE(ui::AXStringAttribute, ui::AX_STRING_ATTRIBUTE_LAST) 278 IPC_ENUM_TRAITS_MAX_VALUE(ui::AXStringAttribute, ui::AX_STRING_ATTRIBUTE_LAST)
274 279
275 #endif // CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_ 280 #endif // CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698