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

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 2759333002: Move chrome-specific SerializedNavigation code to chrome/. (Closed)
Patch Set: Fix Android Created 3 years, 9 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
« no previous file with comments | « chrome/browser/browser_about_handler.cc ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 570f33c4b9033c9cb8cab581dfc506b585bc0133..5922398fb3070f47650da9a0a954ddb141eaa9f6 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -85,6 +85,7 @@
#include "chrome/browser/profiles/profile_attributes_storage.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/profiles/profiles_state.h"
+#include "chrome/browser/sessions/chrome_serialized_navigation_driver.h"
#include "chrome/browser/shell_integration.h"
#include "chrome/browser/tracing/navigation_tracing.h"
#include "chrome/browser/translate/translate_service.h"
@@ -1818,6 +1819,13 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
g_browser_process->local_state());
ThreadWatcherList::StartWatchingAll(parsed_command_line());
+ // This has to come before the first GetInstance() call. PreBrowserStart()
+ // seems like a reasonable place to put this, except on Android,
+ // OfflinePageInfoHandler::Register() below calls GetInstance().
+ // TODO(thestig): See if the Android code below can be moved to later.
+ sessions::ContentSerializedNavigationDriver::SetInstance(
+ ChromeSerializedNavigationDriver::GetInstance());
+
#if defined(OS_ANDROID)
ThreadWatcherAndroid::RegisterApplicationStatusListener();
offline_pages::OfflinePageInfoHandler::Register();
« no previous file with comments | « chrome/browser/browser_about_handler.cc ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698