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

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

Issue 11016023: Quickly close tabs/window with long-running unload handlers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add tests. Drop test's use of non-public API. Created 8 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) 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 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 248
249 virtual const std::string& GetContentsMimeType() const OVERRIDE; 249 virtual const std::string& GetContentsMimeType() const OVERRIDE;
250 virtual bool WillNotifyDisconnection() const OVERRIDE; 250 virtual bool WillNotifyDisconnection() const OVERRIDE;
251 virtual void SetOverrideEncoding(const std::string& encoding) OVERRIDE; 251 virtual void SetOverrideEncoding(const std::string& encoding) OVERRIDE;
252 virtual void ResetOverrideEncoding() OVERRIDE; 252 virtual void ResetOverrideEncoding() OVERRIDE;
253 virtual content::RendererPreferences* GetMutableRendererPrefs() OVERRIDE; 253 virtual content::RendererPreferences* GetMutableRendererPrefs() OVERRIDE;
254 virtual void SetNewTabStartTime(const base::TimeTicks& time) OVERRIDE; 254 virtual void SetNewTabStartTime(const base::TimeTicks& time) OVERRIDE;
255 virtual base::TimeTicks GetNewTabStartTime() const OVERRIDE; 255 virtual base::TimeTicks GetNewTabStartTime() const OVERRIDE;
256 virtual void Close() OVERRIDE; 256 virtual void Close() OVERRIDE;
257 virtual void OnCloseStarted() OVERRIDE; 257 virtual void OnCloseStarted() OVERRIDE;
258 virtual void OnUnloadDetachedStarted() OVERRIDE;
258 virtual bool ShouldAcceptDragAndDrop() const OVERRIDE; 259 virtual bool ShouldAcceptDragAndDrop() const OVERRIDE;
259 virtual void SystemDragEnded() OVERRIDE; 260 virtual void SystemDragEnded() OVERRIDE;
260 virtual void UserGestureDone() OVERRIDE; 261 virtual void UserGestureDone() OVERRIDE;
261 virtual void SetClosedByUserGesture(bool value) OVERRIDE; 262 virtual void SetClosedByUserGesture(bool value) OVERRIDE;
262 virtual bool GetClosedByUserGesture() const OVERRIDE; 263 virtual bool GetClosedByUserGesture() const OVERRIDE;
263 virtual double GetZoomLevel() const OVERRIDE; 264 virtual double GetZoomLevel() const OVERRIDE;
264 virtual int GetZoomPercent(bool* enable_increment, 265 virtual int GetZoomPercent(bool* enable_increment,
265 bool* enable_decrement) const OVERRIDE; 266 bool* enable_decrement) const OVERRIDE;
266 virtual void ViewSource() OVERRIDE; 267 virtual void ViewSource() OVERRIDE;
267 virtual void ViewFrameSource(const GURL& url, 268 virtual void ViewFrameSource(const GURL& url,
(...skipping 559 matching lines...) Expand 10 before | Expand all | Expand 10 after
827 828
828 // The time that we started to create the new tab page. 829 // The time that we started to create the new tab page.
829 base::TimeTicks new_tab_start_time_; 830 base::TimeTicks new_tab_start_time_;
830 831
831 // The time that we started to close this WebContents. 832 // The time that we started to close this WebContents.
832 base::TimeTicks close_start_time_; 833 base::TimeTicks close_start_time_;
833 834
834 // The time when onbeforeunload ended. 835 // The time when onbeforeunload ended.
835 base::TimeTicks before_unload_end_time_; 836 base::TimeTicks before_unload_end_time_;
836 837
838 // The time when the tab was removed from view during close.
839 base::TimeTicks unload_detached_start_time_;
840
837 // The time that this tab was last selected. 841 // The time that this tab was last selected.
838 base::TimeTicks last_selected_time_; 842 base::TimeTicks last_selected_time_;
839 843
840 // See description above setter. 844 // See description above setter.
841 bool closed_by_user_gesture_; 845 bool closed_by_user_gesture_;
842 846
843 // Minimum/maximum zoom percent. 847 // Minimum/maximum zoom percent.
844 int minimum_zoom_percent_; 848 int minimum_zoom_percent_;
845 int maximum_zoom_percent_; 849 int maximum_zoom_percent_;
846 // If true, the default zoom limits have been overriden for this tab, in which 850 // If true, the default zoom limits have been overriden for this tab, in which
(...skipping 27 matching lines...) Expand all
874 content::RenderViewHost* message_source_; 878 content::RenderViewHost* message_source_;
875 879
876 // All live RenderWidgetHostImpls that are created by this object and may 880 // All live RenderWidgetHostImpls that are created by this object and may
877 // outlive it. 881 // outlive it.
878 std::set<content::RenderWidgetHostImpl*> created_widgets_; 882 std::set<content::RenderWidgetHostImpl*> created_widgets_;
879 883
880 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 884 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
881 }; 885 };
882 886
883 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 887 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698