OLD | NEW |
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 1046 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1057 | 1057 |
1058 // Map of SiteInstance ID to max page ID for this tab. A page ID is specific | 1058 // Map of SiteInstance ID to max page ID for this tab. A page ID is specific |
1059 // to a given tab and SiteInstance, and must be valid for the lifetime of the | 1059 // to a given tab and SiteInstance, and must be valid for the lifetime of the |
1060 // WebContentsImpl. | 1060 // WebContentsImpl. |
1061 std::map<int32, int32> max_page_ids_; | 1061 std::map<int32, int32> max_page_ids_; |
1062 | 1062 |
1063 // The current load state and the URL associated with it. | 1063 // The current load state and the URL associated with it. |
1064 net::LoadStateWithParam load_state_; | 1064 net::LoadStateWithParam load_state_; |
1065 base::string16 load_state_host_; | 1065 base::string16 load_state_host_; |
1066 | 1066 |
| 1067 // LoadingProgressMap maps FrameTreeNode IDs to a double representing that |
| 1068 // frame's completion (from 0 to 1). |
| 1069 typedef base::hash_map<int64, double> LoadingProgressMap; |
| 1070 LoadingProgressMap loading_progresses_; |
1067 double loading_total_progress_; | 1071 double loading_total_progress_; |
1068 | 1072 |
1069 base::TimeTicks loading_last_progress_update_; | 1073 base::TimeTicks loading_last_progress_update_; |
1070 | 1074 |
| 1075 // Counter to track how many frames have sent start notifications but not |
| 1076 // stop notifications. |
| 1077 int loading_frames_in_progress_; |
| 1078 |
1071 // Upload progress, for displaying in the status bar. | 1079 // Upload progress, for displaying in the status bar. |
1072 // Set to zero when there is no significant upload happening. | 1080 // Set to zero when there is no significant upload happening. |
1073 uint64 upload_size_; | 1081 uint64 upload_size_; |
1074 uint64 upload_position_; | 1082 uint64 upload_position_; |
1075 | 1083 |
1076 // Data for current page ----------------------------------------------------- | 1084 // Data for current page ----------------------------------------------------- |
1077 | 1085 |
1078 // When a title cannot be taken from any entry, this title will be used. | 1086 // When a title cannot be taken from any entry, this title will be used. |
1079 base::string16 page_title_when_no_navigation_entry_; | 1087 base::string16 page_title_when_no_navigation_entry_; |
1080 | 1088 |
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1272 // Adds/removes a callback called on creation of each new WebContents. | 1280 // Adds/removes a callback called on creation of each new WebContents. |
1273 static void AddCreatedCallbackForTesting(const CreatedCallback& callback); | 1281 static void AddCreatedCallbackForTesting(const CreatedCallback& callback); |
1274 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback); | 1282 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback); |
1275 | 1283 |
1276 DISALLOW_COPY_AND_ASSIGN(FriendZone); | 1284 DISALLOW_COPY_AND_ASSIGN(FriendZone); |
1277 }; | 1285 }; |
1278 | 1286 |
1279 } // namespace content | 1287 } // namespace content |
1280 | 1288 |
1281 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ | 1289 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ |
OLD | NEW |