Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 49 #include "chrome/browser/net/chrome_dns_cert_provenance_checker.h" | 49 #include "chrome/browser/net/chrome_dns_cert_provenance_checker.h" |
| 50 #include "chrome/browser/net/chrome_dns_cert_provenance_checker_factory.h" | 50 #include "chrome/browser/net/chrome_dns_cert_provenance_checker_factory.h" |
| 51 #include "chrome/browser/net/metadata_url_request.h" | 51 #include "chrome/browser/net/metadata_url_request.h" |
| 52 #include "chrome/browser/net/predictor_api.h" | 52 #include "chrome/browser/net/predictor_api.h" |
| 53 #include "chrome/browser/net/sdch_dictionary_fetcher.h" | 53 #include "chrome/browser/net/sdch_dictionary_fetcher.h" |
| 54 #include "chrome/browser/net/websocket_experiment/websocket_experiment_runner.h" | 54 #include "chrome/browser/net/websocket_experiment/websocket_experiment_runner.h" |
| 55 #include "chrome/browser/plugin_service.h" | 55 #include "chrome/browser/plugin_service.h" |
| 56 #include "chrome/browser/prefs/browser_prefs.h" | 56 #include "chrome/browser/prefs/browser_prefs.h" |
| 57 #include "chrome/browser/prefs/pref_service.h" | 57 #include "chrome/browser/prefs/pref_service.h" |
| 58 #include "chrome/browser/prefs/pref_value_store.h" | 58 #include "chrome/browser/prefs/pref_value_store.h" |
| 59 #include "chrome/browser/prerender/prerender_manager.h" | |
| 59 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" | 60 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" |
| 60 #include "chrome/browser/process_singleton.h" | 61 #include "chrome/browser/process_singleton.h" |
| 61 #include "chrome/browser/profiles/profile.h" | 62 #include "chrome/browser/profiles/profile.h" |
| 62 #include "chrome/browser/profiles/profile_manager.h" | 63 #include "chrome/browser/profiles/profile_manager.h" |
| 63 #include "chrome/browser/renderer_host/resource_dispatcher_host.h" | 64 #include "chrome/browser/renderer_host/resource_dispatcher_host.h" |
| 64 #include "chrome/browser/search_engines/search_engine_type.h" | 65 #include "chrome/browser/search_engines/search_engine_type.h" |
| 65 #include "chrome/browser/search_engines/template_url.h" | 66 #include "chrome/browser/search_engines/template_url.h" |
| 66 #include "chrome/browser/search_engines/template_url_model.h" | 67 #include "chrome/browser/search_engines/template_url_model.h" |
| 67 #include "chrome/browser/service/service_process_control.h" | 68 #include "chrome/browser/service/service_process_control.h" |
| 68 #include "chrome/browser/service/service_process_control_manager.h" | 69 #include "chrome/browser/service/service_process_control_manager.h" |
| (...skipping 1505 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1574 FilePath path = | 1575 FilePath path = |
| 1575 parsed_command_line.GetSwitchValuePath(switches::kDebugPrint); | 1576 parsed_command_line.GetSwitchValuePath(switches::kDebugPrint); |
| 1576 printing::PrintedDocument::set_debug_dump_path(path); | 1577 printing::PrintedDocument::set_debug_dump_path(path); |
| 1577 } | 1578 } |
| 1578 #endif | 1579 #endif |
| 1579 | 1580 |
| 1580 HandleTestParameters(parsed_command_line); | 1581 HandleTestParameters(parsed_command_line); |
| 1581 RecordBreakpadStatusUMA(metrics); | 1582 RecordBreakpadStatusUMA(metrics); |
| 1582 about_flags::RecordUMAStatistics(user_prefs); | 1583 about_flags::RecordUMAStatistics(user_prefs); |
| 1583 | 1584 |
| 1585 UMA_HISTOGRAM_ENUMERATION( | |
|
cbentzel
2011/01/26 16:55:46
I'd really like this to be placed in PrefetchField
gavinp
2011/01/27 04:29:29
Done.
| |
| 1586 "Prerender.Sessions", PrerenderManager::GetSessionType(), | |
| 1587 PrerenderManager::PRERENDERING_SESSION_TYPE_MAX); | |
| 1588 | |
| 1584 // Stat the directory with the inspector's files so that we can know if we | 1589 // Stat the directory with the inspector's files so that we can know if we |
| 1585 // should display the entry in the context menu or not. | 1590 // should display the entry in the context menu or not. |
| 1586 browser_process->CheckForInspectorFiles(); | 1591 browser_process->CheckForInspectorFiles(); |
| 1587 | 1592 |
| 1588 #if defined(OS_CHROMEOS) | 1593 #if defined(OS_CHROMEOS) |
| 1589 metrics->StartExternalMetrics(); | 1594 metrics->StartExternalMetrics(); |
| 1590 #endif | 1595 #endif |
| 1591 | 1596 |
| 1592 // Initialize extension event routers. Note that on Chrome OS, this will | 1597 // Initialize extension event routers. Note that on Chrome OS, this will |
| 1593 // not succeed if the user has not logged in yet, in which case the | 1598 // not succeed if the user has not logged in yet, in which case the |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1749 #if defined(OS_CHROMEOS) | 1754 #if defined(OS_CHROMEOS) |
| 1750 // To be precise, logout (browser shutdown) is not yet done, but the | 1755 // To be precise, logout (browser shutdown) is not yet done, but the |
| 1751 // remaining work is negligible, hence we say LogoutDone here. | 1756 // remaining work is negligible, hence we say LogoutDone here. |
| 1752 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", | 1757 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", |
| 1753 false); | 1758 false); |
| 1754 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); | 1759 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); |
| 1755 #endif | 1760 #endif |
| 1756 TRACE_EVENT_END("BrowserMain", 0, 0); | 1761 TRACE_EVENT_END("BrowserMain", 0, 0); |
| 1757 return result_code; | 1762 return result_code; |
| 1758 } | 1763 } |
| OLD | NEW |