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

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

Issue 567943002: Refactoring the weak_ptr_factory order content/browser folder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolving swarming errors Created 6 years, 3 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 1043 matching lines...) Expand 10 before | Expand all | Expand 10 after
1054 base::string16 load_state_host_; 1054 base::string16 load_state_host_;
1055 1055
1056 // LoadingProgressMap maps FrameTreeNode IDs to a double representing that 1056 // LoadingProgressMap maps FrameTreeNode IDs to a double representing that
1057 // frame's completion (from 0 to 1). 1057 // frame's completion (from 0 to 1).
1058 typedef base::hash_map<int64, double> LoadingProgressMap; 1058 typedef base::hash_map<int64, double> LoadingProgressMap;
1059 LoadingProgressMap loading_progresses_; 1059 LoadingProgressMap loading_progresses_;
1060 double loading_total_progress_; 1060 double loading_total_progress_;
1061 1061
1062 base::TimeTicks loading_last_progress_update_; 1062 base::TimeTicks loading_last_progress_update_;
1063 1063
1064 base::WeakPtrFactory<WebContentsImpl> loading_weak_factory_;
1065
1066 // Counter to track how many frames have sent start notifications but not 1064 // Counter to track how many frames have sent start notifications but not
1067 // stop notifications. 1065 // stop notifications.
1068 int loading_frames_in_progress_; 1066 int loading_frames_in_progress_;
1069 1067
1070 // Upload progress, for displaying in the status bar. 1068 // Upload progress, for displaying in the status bar.
1071 // Set to zero when there is no significant upload happening. 1069 // Set to zero when there is no significant upload happening.
1072 uint64 upload_size_; 1070 uint64 upload_size_;
1073 uint64 upload_position_; 1071 uint64 upload_position_;
1074 1072
1075 // Data for current page ----------------------------------------------------- 1073 // Data for current page -----------------------------------------------------
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
1234 1232
1235 scoped_ptr<ManifestManagerHost> manifest_manager_host_; 1233 scoped_ptr<ManifestManagerHost> manifest_manager_host_;
1236 1234
1237 // The accessibility mode for all frames. This is queried when each frame 1235 // The accessibility mode for all frames. This is queried when each frame
1238 // is created, and broadcast to all frames when it changes. 1236 // is created, and broadcast to all frames when it changes.
1239 AccessibilityMode accessibility_mode_; 1237 AccessibilityMode accessibility_mode_;
1240 1238
1241 // Monitors power levels for audio streams associated with this WebContents. 1239 // Monitors power levels for audio streams associated with this WebContents.
1242 AudioStreamMonitor audio_stream_monitor_; 1240 AudioStreamMonitor audio_stream_monitor_;
1243 1241
1242 base::WeakPtrFactory<WebContentsImpl> loading_weak_factory_;
1243
1244 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 1244 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
1245 }; 1245 };
1246 1246
1247 } // namespace content 1247 } // namespace content
1248 1248
1249 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 1249 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/web_contents/aura/window_slider.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