Navigation: move RestoreType and ReloadType into a separate file

content/browser/frame_host/navigation_entry_impl.h

 // Copyright 2013 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_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_
 
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "content/browser/frame_host/frame_navigation_entry.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/common/frame_message_enums.h"
 #include "content/common/resource_request_body_impl.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/global_request_id.h"
 #include "content/public/browser/navigation_entry.h"
+#include "content/public/browser/navigation_type.h"

[Charlie Reis, 2016/09/09 05:41:05]

I don't think we need this, do we?

[Takashi Toyoshima, 2016/09/09 07:31:30]

Oh, right. We only need restore_type.h here.

+#include "content/public/browser/restore_type.h"
 #include "content/public/common/page_state.h"
 #include "content/public/common/ssl_status.h"
 
 namespace content {
 class ResourceRequestBodyImpl;
 struct CommonNavigationParams;
 struct RequestNavigationParams;
 struct StartNavigationParams;
 
 class CONTENT_EXPORT NavigationEntryImpl
@@ skipping 261 matching lines @@
     is_renderer_initiated_ = is_renderer_initiated;
   }
   bool is_renderer_initiated() const {
     return is_renderer_initiated_;
   }
 
   void set_user_typed_url(const GURL& user_typed_url) {
     user_typed_url_ = user_typed_url;
   }
 
-  // Enumerations of the possible restore types.
-  enum RestoreType {
-    // Restore from the previous session.
-    RESTORE_LAST_SESSION_EXITED_CLEANLY,
-    RESTORE_LAST_SESSION_CRASHED,
-
-    // The entry has been restored from the current session. This is used when
-    // the user issues 'reopen closed tab'.
-    RESTORE_CURRENT_SESSION,
-
-    // The entry was not restored.
-    RESTORE_NONE
-  };
-
   // The RestoreType for this entry. This is set if the entry was retored. This
   // is set to RESTORE_NONE once the entry is loaded.
   void set_restore_type(RestoreType type) {
     restore_type_ = type;
   }
   RestoreType restore_type() const {
     return restore_type_;
   }
 
   void set_transferred_global_request_id(
@@ skipping 194 matching lines @@
   // persisted, unless specific data is taken out/put back in at save/restore
   // time (see TabNavigation for an example of this).
   std::map<std::string, base::string16> extra_data_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationEntryImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_