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

Side by Side Diff: content/public/renderer/navigation_state.cc

Issue 8404018: chrome.loadTimes() shouldn't be affected by in-document navigation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix style Created 9 years, 1 month 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "content/public/renderer/navigation_state.h" 5 #include "content/public/renderer/navigation_state.h"
6 6
7 #include "webkit/glue/alt_error_page_resource_fetcher.h" 7 #include "webkit/glue/alt_error_page_resource_fetcher.h"
8 #include "webkit/glue/password_form.h" 8 #include "webkit/glue/password_form.h"
9 9
10 namespace content { 10 namespace content {
11 11
12 NavigationState::~NavigationState() {} 12 NavigationState::~NavigationState() {}
13 13
14 void NavigationState::set_password_form_data(webkit_glue::PasswordForm* data) { 14 void NavigationState::set_password_form_data(webkit_glue::PasswordForm* data) {
15 password_form_data_.reset(data); 15 password_form_data_.reset(data);
16 } 16 }
17 17
18 void NavigationState::set_alt_error_page_fetcher( 18 void NavigationState::set_alt_error_page_fetcher(
19 webkit_glue::AltErrorPageResourceFetcher* f) { 19 webkit_glue::AltErrorPageResourceFetcher* f) {
20 alt_error_page_fetcher_.reset(f); 20 alt_error_page_fetcher_.reset(f);
21 } 21 }
22 22
23 NavigationState::NavigationState(content::PageTransition transition_type, 23 NavigationState::NavigationState(const LoadTimes& load_times,
24 const base::Time& request_time, 24 content::PageTransition transition_type,
25 bool is_content_initiated, 25 bool is_content_initiated,
26 int32 pending_page_id, 26 int32 pending_page_id,
27 int pending_history_list_offset) 27 int pending_history_list_offset)
28 : transition_type_(transition_type), 28 : load_times_(load_times),
29 transition_type_(transition_type),
29 load_type_(UNDEFINED_LOAD), 30 load_type_(UNDEFINED_LOAD),
30 request_time_(request_time),
31 load_histograms_recorded_(false),
32 web_timing_histograms_recorded_(false),
33 request_committed_(false), 31 request_committed_(false),
34 is_content_initiated_(is_content_initiated), 32 is_content_initiated_(is_content_initiated),
35 pending_page_id_(pending_page_id), 33 pending_page_id_(pending_page_id),
36 pending_history_list_offset_(pending_history_list_offset), 34 pending_history_list_offset_(pending_history_list_offset),
37 use_error_page_(false), 35 use_error_page_(false),
38 cache_policy_override_set_(false), 36 cache_policy_override_set_(false),
39 cache_policy_override_(WebKit::WebURLRequest::UseProtocolCachePolicy), 37 cache_policy_override_(WebKit::WebURLRequest::UseProtocolCachePolicy),
40 http_status_code_(0),
41 was_fetched_via_spdy_(false),
42 was_npn_negotiated_(false),
43 was_alternate_protocol_available_(false),
44 was_fetched_via_proxy_(false),
45 was_translated_(false),
46 was_within_same_page_(false), 38 was_within_same_page_(false),
47 was_prefetcher_(false), 39 was_prefetcher_(false),
48 was_referred_by_prefetcher_(false) { 40 was_referred_by_prefetcher_(false) {
49 } 41 }
50 42
43 NavigationState::LoadTimes::LoadTimes(const base::Time& request_time)
44 : request_time_(request_time),
45 load_histograms_recorded_(false),
46 web_timing_histograms_recorded_(false),
47 http_status_code_(0),
48 was_fetched_via_spdy_(false),
49 was_npn_negotiated_(false),
50 was_alternate_protocol_available_(false),
51 was_fetched_via_proxy_(false) {
52 }
53
51 } // namespace content 54 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698