Shift "commit point" for when a download will no longer accept cancels.

content/browser/download/download_item_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_DOWNLOAD_DOWNLOAD_ITEM_IMPL_H_
 #define CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_ITEM_IMPL_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 189 matching lines @@
   // should be considered complete.
   virtual void MarkAsComplete();
 
   // Interactions with persistence system --------------------------------------
 
   // TODO(benjhayden): Remove when DownloadHistory becomes an observer.
   virtual void SetIsPersisted();
   virtual void SetDbHandle(int64 handle);
 
  private:
+  // Fine grained states of a download.
+  enum DownloadInternalState {
+    // Unless otherwise specified, state transitions are linear forward
+    // in this list.
+
+    // Includes both before and after file name determination.
+    // TODO(rdsmith): Put in state variable for file name determination.

[benjhayden, 2012/09/19 15:44:35]

Why not go ahead and do this now?

[Randy Smith (Not in Mondays), 2012/09/19 20:46:39]

Not relevant to the focus of this CL, and after six reverts and four "peeled
off" CLs I'm feeling a little gun-shy about putting extra stuff into CLs :-}.

+    IN_PROGRESS_INTERNAL,
+
+    // Between commit point (dispatch of download file release) and
+    // completed.  Embedder may be opening the file in this state.
+    COMPLETING_INTERNAL,
+
+    // After embedder has had a chance to auto-open.  User may now open
+    // or auto-open based on extension.
+    COMPLETE_INTERNAL,
+
+    // User has cancelled the download.
+    // Only incoming transition IN_PROGRESS->
+    CANCELLED_INTERNAL,

[benjhayden, 2012/09/19 15:44:35]

I thought we wanted to merge this with interrupted? What would it take to do
that now?

[Randy Smith (Not in Mondays), 2012/09/19 20:46:39]

Shooting from the hip, 2-3 hours of coding and about double that in wall clock
time?  It's not at all a hard change, I'm just reluctant to do it as part of
this CL because of the stacked dependencies (i.e. I can't remove the DFM until I
get this in).

+
+    // An error has interrupted the download.
+    // Only incoming transition IN_PROGRESS->
+    INTERRUPTED_INTERNAL,
+
+    MAX_DOWNLOAD_INTERNAL_STATE,
+  };
+
+  // Map from DownloadInternalState -> DownloadState.
+  static const DownloadState kInternalStateMap[];
+
+  // Map from DownloadState -> DownloadInternalState (for external
+  // initialization).
+  static const DownloadInternalState kExternalStateMap[];
+
   // Normal progression of a download ------------------------------------------
 
   // These are listed in approximately chronological order.  There are also
   // public methods involved in normal download progression; see
   // the implementation ordering in download_item_impl.cc.
 
   // Construction common to all constructors. |active| should be true for new
   // downloads and false for downloads from the history.
   // |download_type| indicates to the net log system what kind of download
   // this is.
@@ skipping 22 matching lines @@
   // GetTargetFilePath().
   bool NeedsRename() const;
 
   // Internal helper for maintaining consistent received and total sizes, and
   // setting the final hash.
   // Should only be called from |OnAllDataSaved|.
   void ProgressComplete(int64 bytes_so_far,
                         const std::string& final_hash);
 
   // Call to transition state; all state transitions should go through this.
-  void TransitionTo(DownloadState new_state);
+  void TransitionTo(DownloadInternalState new_state);
 
   // Set the |danger_type_| and invoke obserers if necessary.
   void SetDangerType(content::DownloadDangerType danger_type);
 
   void SetFullPath(const FilePath& new_path);
 
+  // Debugging routines --------------------------------------------------------
+  static const char* DebugDownloadStateString(DownloadInternalState state);
+
   // The handle to the request information.  Used for operations outside the
   // download system.
   scoped_ptr<DownloadRequestHandleInterface> request_handle_;
 
   // Download ID assigned by DownloadResourceHandler.
   content::DownloadId download_id_;
 
   // Display name for the download. If this is empty, then the display name is
   // considered to be |target_path_.BaseName()|.
   FilePath display_name_;
@@ skipping 77 matching lines @@
   // Server's ETAG for the file.
   std::string etag_;
 
   // Last reason.
   content::DownloadInterruptReason last_reason_;
 
   // Start time for recording statistics.
   base::TimeTicks start_tick_;
 
   // The current state of this download.
-  DownloadState state_;
+  DownloadInternalState state_;
 
   // Current danger type for the download.
   content::DownloadDangerType danger_type_;
 
   // The views of this item in the download shelf and download contents.
   ObserverList<Observer> observers_;
 
   // Time the download was started.
   base::Time start_time_;
 
@@ skipping 46 matching lines @@
 
   // Net log to use for this download.
   const net::BoundNetLog bound_net_log_;
 
   base::WeakPtrFactory<DownloadItemImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadItemImpl);
 };
 
 #endif  // CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_ITEM_IMPL_H_