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

Side by Side Diff: content/browser/web_contents/web_contents_impl.h

Issue 1309323004: Create a NavigationEntry for the initial blank page. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix GetEntryCount, more tests Created 5 years, 2 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 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 1103 matching lines...) Expand 10 before | Expand all | Expand 10 after
1114 // Set to zero when there is no significant upload happening. 1114 // Set to zero when there is no significant upload happening.
1115 uint64 upload_size_; 1115 uint64 upload_size_;
1116 uint64 upload_position_; 1116 uint64 upload_position_;
1117 1117
1118 // Tracks that this WebContents needs to unblock requests to the renderer. 1118 // Tracks that this WebContents needs to unblock requests to the renderer.
1119 // See ResumeLoadingCreatedWebContents. 1119 // See ResumeLoadingCreatedWebContents.
1120 bool is_resume_pending_; 1120 bool is_resume_pending_;
1121 1121
1122 // Data for current page ----------------------------------------------------- 1122 // Data for current page -----------------------------------------------------
1123 1123
1124 // When a title cannot be taken from any entry, this title will be used.
1125 base::string16 page_title_when_no_navigation_entry_;
1126
1127 // When a navigation occurs, we record its contents MIME type. It can be 1124 // When a navigation occurs, we record its contents MIME type. It can be
1128 // used to check whether we can do something for some special contents. 1125 // used to check whether we can do something for some special contents.
1129 std::string contents_mime_type_; 1126 std::string contents_mime_type_;
1130 1127
1131 // The last reported character encoding, not canonicalized. 1128 // The last reported character encoding, not canonicalized.
1132 std::string last_reported_encoding_; 1129 std::string last_reported_encoding_;
1133 1130
1134 // The canonicalized character encoding. 1131 // The canonicalized character encoding.
1135 std::string canonical_encoding_; 1132 std::string canonical_encoding_;
1136 1133
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
1328 // Adds/removes a callback called on creation of each new WebContents. 1325 // Adds/removes a callback called on creation of each new WebContents.
1329 static void AddCreatedCallbackForTesting(const CreatedCallback& callback); 1326 static void AddCreatedCallbackForTesting(const CreatedCallback& callback);
1330 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback); 1327 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback);
1331 1328
1332 DISALLOW_COPY_AND_ASSIGN(FriendZone); 1329 DISALLOW_COPY_AND_ASSIGN(FriendZone);
1333 }; 1330 };
1334 1331
1335 } // namespace content 1332 } // namespace content
1336 1333
1337 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 1334 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_manager_browsertest.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698