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

Side by Side Diff: chrome/browser/chrome_browser_main.cc

Issue 2310363002: Persist offline page info in a navigation entry if needed (Closed)
Patch Set: Fix win compiling error due to using unique_ptr map in SESSIONS_EXPORT class Created 4 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chrome_browser_main.h" 5 #include "chrome/browser/chrome_browser_main.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 #include "net/cookies/cookie_monster.h" 169 #include "net/cookies/cookie_monster.h"
170 #include "net/http/http_network_layer.h" 170 #include "net/http/http_network_layer.h"
171 #include "net/http/http_stream_factory.h" 171 #include "net/http/http_stream_factory.h"
172 #include "net/url_request/url_request.h" 172 #include "net/url_request/url_request.h"
173 #include "ui/base/l10n/l10n_util.h" 173 #include "ui/base/l10n/l10n_util.h"
174 #include "ui/base/layout.h" 174 #include "ui/base/layout.h"
175 #include "ui/base/material_design/material_design_controller.h" 175 #include "ui/base/material_design/material_design_controller.h"
176 #include "ui/base/resource/resource_bundle.h" 176 #include "ui/base/resource/resource_bundle.h"
177 177
178 #if defined(OS_ANDROID) 178 #if defined(OS_ANDROID)
179 #include "chrome/browser/android/offline_pages/offline_page_info_handler.h"
179 #include "chrome/browser/metrics/thread_watcher_android.h" 180 #include "chrome/browser/metrics/thread_watcher_android.h"
180 #include "ui/base/resource/resource_bundle_android.h" 181 #include "ui/base/resource/resource_bundle_android.h"
181 #else 182 #else
182 #include "chrome/browser/feedback/feedback_profile_observer.h" 183 #include "chrome/browser/feedback/feedback_profile_observer.h"
183 #endif // defined(OS_ANDROID) 184 #endif // defined(OS_ANDROID)
184 185
185 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 186 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
186 #include "chrome/browser/first_run/upgrade_util_linux.h" 187 #include "chrome/browser/first_run/upgrade_util_linux.h"
187 #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) 188 #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
188 189
(...skipping 1735 matching lines...) Expand 10 before | Expand all | Expand 10 after
1924 #endif // defined(ENABLE_PRINT_PREVIEW) 1925 #endif // defined(ENABLE_PRINT_PREVIEW)
1925 1926
1926 // Start watching all browser threads for responsiveness. 1927 // Start watching all browser threads for responsiveness.
1927 metrics::MetricsService::SetExecutionPhase( 1928 metrics::MetricsService::SetExecutionPhase(
1928 metrics::MetricsService::THREAD_WATCHER_START, 1929 metrics::MetricsService::THREAD_WATCHER_START,
1929 g_browser_process->local_state()); 1930 g_browser_process->local_state());
1930 ThreadWatcherList::StartWatchingAll(parsed_command_line()); 1931 ThreadWatcherList::StartWatchingAll(parsed_command_line());
1931 1932
1932 #if defined(OS_ANDROID) 1933 #if defined(OS_ANDROID)
1933 ThreadWatcherAndroid::RegisterApplicationStatusListener(); 1934 ThreadWatcherAndroid::RegisterApplicationStatusListener();
1935 offline_pages::OfflinePageInfoHandler::Register();
1934 #endif // defined(OS_ANDROID) 1936 #endif // defined(OS_ANDROID)
1935 1937
1936 #if !defined(DISABLE_NACL) 1938 #if !defined(DISABLE_NACL)
1937 BrowserThread::PostTask( 1939 BrowserThread::PostTask(
1938 BrowserThread::IO, 1940 BrowserThread::IO,
1939 FROM_HERE, 1941 FROM_HERE,
1940 base::Bind(nacl::NaClProcessHost::EarlyStartup)); 1942 base::Bind(nacl::NaClProcessHost::EarlyStartup));
1941 #endif // !defined(DISABLE_NACL) 1943 #endif // !defined(DISABLE_NACL)
1942 1944
1943 // Make sure initial prefs are recorded 1945 // Make sure initial prefs are recorded
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
2216 chromeos::CrosSettings::Shutdown(); 2218 chromeos::CrosSettings::Shutdown();
2217 #endif // defined(OS_CHROMEOS) 2219 #endif // defined(OS_CHROMEOS)
2218 #endif // defined(OS_ANDROID) 2220 #endif // defined(OS_ANDROID)
2219 } 2221 }
2220 2222
2221 // Public members: 2223 // Public members:
2222 2224
2223 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 2225 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
2224 chrome_extra_parts_.push_back(parts); 2226 chrome_extra_parts_.push_back(parts);
2225 } 2227 }
OLDNEW
« no previous file with comments | « chrome/browser/android/offline_pages/offline_page_info_handler.cc ('k') | components/sessions/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698