| Index: content/common/navigation_params.cc
|
| diff --git a/content/common/navigation_params.cc b/content/common/navigation_params.cc
|
| index bbb431bf3559cbaa08440d3225a2cb4d98fc076b..a6268ba667deaa6136c535785542fcae33e68505 100644
|
| --- a/content/common/navigation_params.cc
|
| +++ b/content/common/navigation_params.cc
|
| @@ -102,25 +102,15 @@ BeginNavigationParams::BeginNavigationParams(
|
| const BeginNavigationParams& other) = default;
|
|
|
| StartNavigationParams::StartNavigationParams()
|
| - :
|
| -#if defined(OS_ANDROID)
|
| - has_user_gesture(false),
|
| -#endif
|
| - transferred_request_child_id(-1),
|
| + : transferred_request_child_id(-1),
|
| transferred_request_request_id(-1) {
|
| }
|
|
|
| StartNavigationParams::StartNavigationParams(
|
| const std::string& extra_headers,
|
| -#if defined(OS_ANDROID)
|
| - bool has_user_gesture,
|
| -#endif
|
| int transferred_request_child_id,
|
| int transferred_request_request_id)
|
| : extra_headers(extra_headers),
|
| -#if defined(OS_ANDROID)
|
| - has_user_gesture(has_user_gesture),
|
| -#endif
|
| transferred_request_child_id(transferred_request_child_id),
|
| transferred_request_request_id(transferred_request_request_id) {
|
| }
|
| @@ -148,7 +138,8 @@ RequestNavigationParams::RequestNavigationParams()
|
| is_view_source(false),
|
| should_clear_history_list(false),
|
| should_create_service_worker(false),
|
| - service_worker_provider_id(kInvalidServiceWorkerProviderId) {}
|
| + service_worker_provider_id(kInvalidServiceWorkerProviderId),
|
| + has_user_gesture(false) {}
|
|
|
| RequestNavigationParams::RequestNavigationParams(
|
| bool is_overriding_user_agent,
|
| @@ -167,7 +158,8 @@ RequestNavigationParams::RequestNavigationParams(
|
| int current_history_list_offset,
|
| int current_history_list_length,
|
| bool is_view_source,
|
| - bool should_clear_history_list)
|
| + bool should_clear_history_list,
|
| + bool has_user_gesture)
|
| : is_overriding_user_agent(is_overriding_user_agent),
|
| redirects(redirects),
|
| can_load_local_resources(can_load_local_resources),
|
| @@ -186,7 +178,8 @@ RequestNavigationParams::RequestNavigationParams(
|
| is_view_source(is_view_source),
|
| should_clear_history_list(should_clear_history_list),
|
| should_create_service_worker(false),
|
| - service_worker_provider_id(kInvalidServiceWorkerProviderId) {}
|
| + service_worker_provider_id(kInvalidServiceWorkerProviderId),
|
| + has_user_gesture(has_user_gesture) {}
|
|
|
| RequestNavigationParams::RequestNavigationParams(
|
| const RequestNavigationParams& other) = default;
|
|
|