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

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

Issue 2759333002: Move chrome-specific SerializedNavigation code to chrome/. (Closed)
Patch Set: bad export 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 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 <set> 10 #include <set>
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 #include "chrome/browser/prefs/incognito_mode_prefs.h" 78 #include "chrome/browser/prefs/incognito_mode_prefs.h"
79 #include "chrome/browser/prefs/pref_metrics_service.h" 79 #include "chrome/browser/prefs/pref_metrics_service.h"
80 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" 80 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
81 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h" 81 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory. h"
82 #include "chrome/browser/process_singleton.h" 82 #include "chrome/browser/process_singleton.h"
83 #include "chrome/browser/profiles/profile.h" 83 #include "chrome/browser/profiles/profile.h"
84 #include "chrome/browser/profiles/profile_attributes_entry.h" 84 #include "chrome/browser/profiles/profile_attributes_entry.h"
85 #include "chrome/browser/profiles/profile_attributes_storage.h" 85 #include "chrome/browser/profiles/profile_attributes_storage.h"
86 #include "chrome/browser/profiles/profile_manager.h" 86 #include "chrome/browser/profiles/profile_manager.h"
87 #include "chrome/browser/profiles/profiles_state.h" 87 #include "chrome/browser/profiles/profiles_state.h"
88 #include "chrome/browser/sessions/chrome_serialized_navigation_driver.h"
88 #include "chrome/browser/shell_integration.h" 89 #include "chrome/browser/shell_integration.h"
89 #include "chrome/browser/tracing/navigation_tracing.h" 90 #include "chrome/browser/tracing/navigation_tracing.h"
90 #include "chrome/browser/translate/translate_service.h" 91 #include "chrome/browser/translate/translate_service.h"
91 #include "chrome/browser/ui/app_list/app_list_service.h" 92 #include "chrome/browser/ui/app_list/app_list_service.h"
92 #include "chrome/browser/ui/browser.h" 93 #include "chrome/browser/ui/browser.h"
93 #include "chrome/browser/ui/browser_finder.h" 94 #include "chrome/browser/ui/browser_finder.h"
94 #include "chrome/browser/ui/javascript_dialogs/chrome_javascript_native_dialog_f actory.h" 95 #include "chrome/browser/ui/javascript_dialogs/chrome_javascript_native_dialog_f actory.h"
95 #include "chrome/browser/ui/profile_error_dialog.h" 96 #include "chrome/browser/ui/profile_error_dialog.h"
96 #include "chrome/browser/ui/startup/bad_flags_prompt.h" 97 #include "chrome/browser/ui/startup/bad_flags_prompt.h"
97 #include "chrome/browser/ui/startup/default_browser_prompt.h" 98 #include "chrome/browser/ui/startup/default_browser_prompt.h"
(...skipping 1284 matching lines...) Expand 10 before | Expand all | Expand 10 after
1382 // other services to start up before we start adjusting the oom priority. 1383 // other services to start up before we start adjusting the oom priority.
1383 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) 1384 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
1384 g_browser_process->GetTabManager()->Start(); 1385 g_browser_process->GetTabManager()->Start();
1385 #endif 1386 #endif
1386 1387
1387 // The RulesetService will make the filtering rules available to renderers 1388 // The RulesetService will make the filtering rules available to renderers
1388 // immediately after its construction, provided that the rules are already 1389 // immediately after its construction, provided that the rules are already
1389 // available at no cost in an indexed format. This enables activating 1390 // available at no cost in an indexed format. This enables activating
1390 // subresource filtering, if needed, also for page loads on start-up. 1391 // subresource filtering, if needed, also for page loads on start-up.
1391 g_browser_process->subresource_filter_ruleset_service(); 1392 g_browser_process->subresource_filter_ruleset_service();
1393
1394 sessions::ContentSerializedNavigationDriver::SetInstance(
1395 ChromeSerializedNavigationDriver::GetInstance());
1392 } 1396 }
1393 1397
1394 void ChromeBrowserMainParts::PostBrowserStart() { 1398 void ChromeBrowserMainParts::PostBrowserStart() {
1395 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PostBrowserStart"); 1399 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PostBrowserStart");
1396 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) 1400 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
1397 chrome_extra_parts_[i]->PostBrowserStart(); 1401 chrome_extra_parts_[i]->PostBrowserStart();
1398 #if !defined(OS_ANDROID) 1402 #if !defined(OS_ANDROID)
1399 // Allow ProcessSingleton to process messages. 1403 // Allow ProcessSingleton to process messages.
1400 process_singleton_->Unlock(); 1404 process_singleton_->Unlock();
1401 #endif // !defined(OS_ANDROID) 1405 #endif // !defined(OS_ANDROID)
(...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after
2093 chromeos::CrosSettings::Shutdown(); 2097 chromeos::CrosSettings::Shutdown();
2094 #endif // defined(OS_CHROMEOS) 2098 #endif // defined(OS_CHROMEOS)
2095 #endif // defined(OS_ANDROID) 2099 #endif // defined(OS_ANDROID)
2096 } 2100 }
2097 2101
2098 // Public members: 2102 // Public members:
2099 2103
2100 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 2104 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
2101 chrome_extra_parts_.push_back(parts); 2105 chrome_extra_parts_.push_back(parts);
2102 } 2106 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698