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

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

Issue 5606002: Move:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/browser_browsertest.cc ('k') | chrome/browser/browser_process_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/browser_main.h" 5 #include "chrome/browser/browser_main.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 #include "chrome/browser/net/chrome_dns_cert_provenance_checker_factory.h" 54 #include "chrome/browser/net/chrome_dns_cert_provenance_checker_factory.h"
55 #include "chrome/browser/net/metadata_url_request.h" 55 #include "chrome/browser/net/metadata_url_request.h"
56 #include "chrome/browser/net/predictor_api.h" 56 #include "chrome/browser/net/predictor_api.h"
57 #include "chrome/browser/net/sdch_dictionary_fetcher.h" 57 #include "chrome/browser/net/sdch_dictionary_fetcher.h"
58 #include "chrome/browser/net/websocket_experiment/websocket_experiment_runner.h" 58 #include "chrome/browser/net/websocket_experiment/websocket_experiment_runner.h"
59 #include "chrome/browser/plugin_service.h" 59 #include "chrome/browser/plugin_service.h"
60 #include "chrome/browser/prefs/pref_service.h" 60 #include "chrome/browser/prefs/pref_service.h"
61 #include "chrome/browser/prefs/pref_value_store.h" 61 #include "chrome/browser/prefs/pref_value_store.h"
62 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" 62 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
63 #include "chrome/browser/process_singleton.h" 63 #include "chrome/browser/process_singleton.h"
64 #include "chrome/browser/profile.h" 64 #include "chrome/browser/profiles/profile.h"
65 #include "chrome/browser/profile_manager.h" 65 #include "chrome/browser/profiles/profile_manager.h"
66 #include "chrome/browser/renderer_host/resource_dispatcher_host.h" 66 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
67 #include "chrome/browser/search_engines/search_engine_type.h" 67 #include "chrome/browser/search_engines/search_engine_type.h"
68 #include "chrome/browser/search_engines/template_url.h" 68 #include "chrome/browser/search_engines/template_url.h"
69 #include "chrome/browser/search_engines/template_url_model.h" 69 #include "chrome/browser/search_engines/template_url_model.h"
70 #include "chrome/browser/service/service_process_control.h" 70 #include "chrome/browser/service/service_process_control.h"
71 #include "chrome/browser/service/service_process_control_manager.h" 71 #include "chrome/browser/service/service_process_control_manager.h"
72 #include "chrome/browser/shell_integration.h" 72 #include "chrome/browser/shell_integration.h"
73 #include "chrome/browser/translate/translate_manager.h" 73 #include "chrome/browser/translate/translate_manager.h"
74 #include "chrome/browser/ui/browser.h" 74 #include "chrome/browser/ui/browser.h"
75 #include "chrome/browser/ui/browser_init.h" 75 #include "chrome/browser/ui/browser_init.h"
(...skipping 1620 matching lines...) Expand 10 before | Expand all | Expand 10 after
1696 #if defined(OS_CHROMEOS) 1696 #if defined(OS_CHROMEOS)
1697 // To be precise, logout (browser shutdown) is not yet done, but the 1697 // To be precise, logout (browser shutdown) is not yet done, but the
1698 // remaining work is negligible, hence we say LogoutDone here. 1698 // remaining work is negligible, hence we say LogoutDone here.
1699 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", 1699 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
1700 false); 1700 false);
1701 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); 1701 chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
1702 #endif 1702 #endif
1703 TRACE_EVENT_END("BrowserMain", 0, 0); 1703 TRACE_EVENT_END("BrowserMain", 0, 0);
1704 return result_code; 1704 return result_code;
1705 } 1705 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_browsertest.cc ('k') | chrome/browser/browser_process_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698