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

Unified Diff: chrome/browser/ui/browser_tabrestore.cc

Issue 2225343002: Navigation: move RestoreType and ReloadType into a separate file (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: [rebase] Created 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/browser_tabrestore.cc
diff --git a/chrome/browser/ui/browser_tabrestore.cc b/chrome/browser/ui/browser_tabrestore.cc
index ca3a06d0ce87e1621a44fe63847d5c5fbf949281..2b9c5b5701985bbb05b96aa674df25c47bc4957b 100644
--- a/chrome/browser/ui/browser_tabrestore.cc
+++ b/chrome/browser/ui/browser_tabrestore.cc
@@ -14,13 +14,13 @@
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/ui/web_contents_sizer.h"
#include "components/sessions/content/content_serialized_navigation_builder.h"
-#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/navigation_entry.h"
+#include "content/public/browser/restore_type.h"
#include "content/public/browser/session_storage_namespace.h"
#include "content/public/browser/web_contents.h"
+using content::RestoreType;
using content::WebContents;
-using content::NavigationController;
using content::NavigationEntry;
using sessions::ContentSerializedNavigationBuilder;
using sessions::SerializedNavigationEntry;
@@ -29,13 +29,12 @@ namespace chrome {
namespace {
-NavigationController::RestoreType GetRestoreType(Browser* browser,
- bool from_last_session) {
+RestoreType GetRestoreType(Browser* browser, bool from_last_session) {
if (!from_last_session)
- return NavigationController::RESTORE_CURRENT_SESSION;
- return browser->profile()->GetLastSessionExitType() == Profile::EXIT_CRASHED ?
- NavigationController::RESTORE_LAST_SESSION_CRASHED :
- NavigationController::RESTORE_LAST_SESSION_EXITED_CLEANLY;
+ return RestoreType::CURRENT_SESSION;
+ return browser->profile()->GetLastSessionExitType() == Profile::EXIT_CRASHED
+ ? RestoreType::LAST_SESSION_CRASHED
+ : RestoreType::LAST_SESSION_EXITED_CLEANLY;
}
WebContents* CreateRestoredTab(

Powered by Google App Engine
This is Rietveld 408576698