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

Side by Side Diff: chrome/renderer/navigation_state.h

Issue 358001: Fixes bug introduced during merging. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 CHROME_RENDERER_NAVIGATION_STATE_H_ 5 #ifndef CHROME_RENDERER_NAVIGATION_STATE_H_
6 #define CHROME_RENDERER_NAVIGATION_STATE_H_ 6 #define CHROME_RENDERER_NAVIGATION_STATE_H_
7 7
8 #include "base/scoped_ptr.h" 8 #include "base/scoped_ptr.h"
9 #include "base/time.h" 9 #include "base/time.h"
10 #include "chrome/common/page_transition_types.h" 10 #include "chrome/common/page_transition_types.h"
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 bool is_content_initiated, 196 bool is_content_initiated,
197 int32 pending_page_id) 197 int32 pending_page_id)
198 : transition_type_(transition_type), 198 : transition_type_(transition_type),
199 request_time_(request_time), 199 request_time_(request_time),
200 load_histograms_recorded_(false), 200 load_histograms_recorded_(false),
201 request_committed_(false), 201 request_committed_(false),
202 is_content_initiated_(is_content_initiated), 202 is_content_initiated_(is_content_initiated),
203 pending_page_id_(pending_page_id), 203 pending_page_id_(pending_page_id),
204 postpone_loading_data_(false), 204 postpone_loading_data_(false),
205 cache_policy_override_set_(false), 205 cache_policy_override_set_(false),
206 cache_policy_override_(WebKit::WebURLRequest::UseProtocolCachePolicy) { 206 cache_policy_override_(WebKit::WebURLRequest::UseProtocolCachePolicy),
207 user_script_idle_scheduler_(NULL) { 207 user_script_idle_scheduler_(NULL) {
208 } 208 }
209 209
210 PageTransition::Type transition_type_; 210 PageTransition::Type transition_type_;
211 base::Time request_time_; 211 base::Time request_time_;
212 base::Time start_load_time_; 212 base::Time start_load_time_;
213 base::Time commit_load_time_; 213 base::Time commit_load_time_;
214 base::Time finish_document_load_time_; 214 base::Time finish_document_load_time_;
215 base::Time finish_load_time_; 215 base::Time finish_load_time_;
216 base::Time first_paint_time_; 216 base::Time first_paint_time_;
(...skipping 12 matching lines...) Expand all
229 229
230 bool cache_policy_override_set_; 230 bool cache_policy_override_set_;
231 WebKit::WebURLRequest::CachePolicy cache_policy_override_; 231 WebKit::WebURLRequest::CachePolicy cache_policy_override_;
232 232
233 scoped_ptr<UserScriptIdleScheduler> user_script_idle_scheduler_; 233 scoped_ptr<UserScriptIdleScheduler> user_script_idle_scheduler_;
234 234
235 DISALLOW_COPY_AND_ASSIGN(NavigationState); 235 DISALLOW_COPY_AND_ASSIGN(NavigationState);
236 }; 236 };
237 237
238 #endif // CHROME_RENDERER_NAVIGATION_STATE_H_ 238 #endif // CHROME_RENDERER_NAVIGATION_STATE_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698