Speculative Revert 195108 "Changes to closing contents with beforeunload/unl..."

trunk/src/content/browser/web_contents/web_contents_impl.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 227 matching lines @@
 
   virtual const std::string& GetContentsMimeType() const OVERRIDE;
   virtual bool WillNotifyDisconnection() const OVERRIDE;
   virtual void SetOverrideEncoding(const std::string& encoding) OVERRIDE;
   virtual void ResetOverrideEncoding() OVERRIDE;
   virtual RendererPreferences* GetMutableRendererPrefs() OVERRIDE;
   virtual void SetNewTabStartTime(const base::TimeTicks& time) OVERRIDE;
   virtual base::TimeTicks GetNewTabStartTime() const OVERRIDE;
   virtual void Close() OVERRIDE;
   virtual void OnCloseStarted() OVERRIDE;
-  virtual void OnCloseCanceled() OVERRIDE;
-  virtual void OnUnloadStarted() OVERRIDE;
-  virtual void OnUnloadDetachedStarted() OVERRIDE;
   virtual void SystemDragEnded() OVERRIDE;
   virtual void UserGestureDone() OVERRIDE;
   virtual void SetClosedByUserGesture(bool value) OVERRIDE;
   virtual bool GetClosedByUserGesture() const OVERRIDE;
   virtual double GetZoomLevel() const OVERRIDE;
   virtual int GetZoomPercent(bool* enable_increment,
                              bool* enable_decrement) const OVERRIDE;
   virtual void ViewSource() OVERRIDE;
   virtual void ViewFrameSource(const GURL& url,
                                const std::string& content_state) OVERRIDE;
@@ skipping 553 matching lines @@
 
   // The time that we started to create the new tab page.
   base::TimeTicks new_tab_start_time_;
 
   // The time that we started to close this WebContents.
   base::TimeTicks close_start_time_;
 
   // The time when onbeforeunload ended.
   base::TimeTicks before_unload_end_time_;
 
-  // The time when the tab was removed from view during close.
-  base::TimeTicks unload_detached_start_time_;
-
   // The time that this tab was last selected.
   base::TimeTicks last_selected_time_;
 
   // See description above setter.
   bool closed_by_user_gesture_;
 
   // Minimum/maximum zoom percent.
   int minimum_zoom_percent_;
   int maximum_zoom_percent_;
   // If true, the default zoom limits have been overriden for this tab, in which
@@ skipping 42 matching lines @@
   // Maps the ids of pending image downloads to their callbacks
   typedef std::map<int, ImageDownloadCallback> ImageDownloadMap;
   ImageDownloadMap image_download_map_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_