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

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

Issue 6520008: Device policy infrastructure (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix ChromeOS tests Created 9 years, 10 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 | Annotate | Revision Log
OLDNEW
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 13 matching lines...) Expand all
24 #include "base/string_util.h" 24 #include "base/string_util.h"
25 #include "base/sys_string_conversions.h" 25 #include "base/sys_string_conversions.h"
26 #include "base/threading/platform_thread.h" 26 #include "base/threading/platform_thread.h"
27 #include "base/threading/thread_restrictions.h" 27 #include "base/threading/thread_restrictions.h"
28 #include "base/time.h" 28 #include "base/time.h"
29 #include "base/utf_string_conversions.h" 29 #include "base/utf_string_conversions.h"
30 #include "base/values.h" 30 #include "base/values.h"
31 #include "build/build_config.h" 31 #include "build/build_config.h"
32 #include "chrome/browser/about_flags.h" 32 #include "chrome/browser/about_flags.h"
33 #include "chrome/browser/browser_main_win.h" 33 #include "chrome/browser/browser_main_win.h"
34 #include "chrome/browser/defaults.h"
35 #include "chrome/browser/browser_process.h" 34 #include "chrome/browser/browser_process.h"
36 #include "chrome/browser/browser_process_impl.h" 35 #include "chrome/browser/browser_process_impl.h"
37 #include "chrome/browser/browser_shutdown.h" 36 #include "chrome/browser/browser_shutdown.h"
38 #include "chrome/browser/browser_thread.h" 37 #include "chrome/browser/browser_thread.h"
38 #include "chrome/browser/defaults.h"
39 #include "chrome/browser/extensions/extension_protocols.h" 39 #include "chrome/browser/extensions/extension_protocols.h"
40 #include "chrome/browser/extensions/extension_service.h" 40 #include "chrome/browser/extensions/extension_service.h"
41 #include "chrome/browser/extensions/extensions_startup.h" 41 #include "chrome/browser/extensions/extensions_startup.h"
42 #include "chrome/browser/first_run/first_run.h" 42 #include "chrome/browser/first_run/first_run.h"
43 #include "chrome/browser/jankometer.h" 43 #include "chrome/browser/jankometer.h"
44 #include "chrome/browser/metrics/histogram_synchronizer.h" 44 #include "chrome/browser/metrics/histogram_synchronizer.h"
45 #include "chrome/browser/metrics/metrics_log.h" 45 #include "chrome/browser/metrics/metrics_log.h"
46 #include "chrome/browser/metrics/metrics_service.h" 46 #include "chrome/browser/metrics/metrics_service.h"
47 #include "chrome/browser/net/blob_url_request_job_factory.h" 47 #include "chrome/browser/net/blob_url_request_job_factory.h"
48 #include "chrome/browser/net/chrome_dns_cert_provenance_checker.h" 48 #include "chrome/browser/net/chrome_dns_cert_provenance_checker.h"
49 #include "chrome/browser/net/chrome_dns_cert_provenance_checker_factory.h" 49 #include "chrome/browser/net/chrome_dns_cert_provenance_checker_factory.h"
50 #include "chrome/browser/net/file_system_url_request_job_factory.h" 50 #include "chrome/browser/net/file_system_url_request_job_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/policy/browser_policy_connector.h"
Mattias Nissler (ping if slow) 2011/02/21 14:39:13 Don't need this. Actually, you can drop the whole
Jakob Kummerow 2011/02/22 10:02:33 Done.
56 #include "chrome/browser/prefs/browser_prefs.h" 57 #include "chrome/browser/prefs/browser_prefs.h"
57 #include "chrome/browser/prefs/pref_service.h" 58 #include "chrome/browser/prefs/pref_service.h"
58 #include "chrome/browser/prefs/pref_value_store.h" 59 #include "chrome/browser/prefs/pref_value_store.h"
59 #include "chrome/browser/prerender/prerender_manager.h" 60 #include "chrome/browser/prerender/prerender_manager.h"
60 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" 61 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
61 #include "chrome/browser/printing/print_dialog_cloud.h" 62 #include "chrome/browser/printing/print_dialog_cloud.h"
62 #include "chrome/browser/process_singleton.h" 63 #include "chrome/browser/process_singleton.h"
63 #include "chrome/browser/profiles/profile.h" 64 #include "chrome/browser/profiles/profile.h"
64 #include "chrome/browser/profiles/profile_manager.h" 65 #include "chrome/browser/profiles/profile_manager.h"
65 #include "chrome/browser/renderer_host/resource_dispatcher_host.h" 66 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
(...skipping 1821 matching lines...) Expand 10 before | Expand all | Expand 10 after
1887 #if defined(OS_CHROMEOS) 1888 #if defined(OS_CHROMEOS)
1888 // To be precise, logout (browser shutdown) is not yet done, but the 1889 // To be precise, logout (browser shutdown) is not yet done, but the
1889 // remaining work is negligible, hence we say LogoutDone here. 1890 // remaining work is negligible, hence we say LogoutDone here.
1890 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", 1891 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
1891 false); 1892 false);
1892 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); 1893 chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
1893 #endif 1894 #endif
1894 TRACE_EVENT_END("BrowserMain", 0, 0); 1895 TRACE_EVENT_END("BrowserMain", 0, 0);
1895 return result_code; 1896 return result_code;
1896 } 1897 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/browser_process.h » ('j') | chrome/browser/policy/browser_policy_connector.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698