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

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

Issue 6538053: WebUI: Move more files from chrome/browser/dom_ui to chrome/browser/webui. Part 5. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « chrome/browser/browser_about_handler.cc ('k') | chrome/browser/browser_shutdown.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) 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 18 matching lines...) Expand all
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" 34 #include "chrome/browser/defaults.h"
35 #include "chrome/browser/browser_process.h" 35 #include "chrome/browser/browser_process.h"
36 #include "chrome/browser/browser_process_impl.h" 36 #include "chrome/browser/browser_process_impl.h"
37 #include "chrome/browser/browser_shutdown.h" 37 #include "chrome/browser/browser_shutdown.h"
38 #include "chrome/browser/browser_thread.h" 38 #include "chrome/browser/browser_thread.h"
39 #include "chrome/browser/dom_ui/chrome_url_data_manager_backend.h"
40 #include "chrome/browser/extensions/extension_protocols.h" 39 #include "chrome/browser/extensions/extension_protocols.h"
41 #include "chrome/browser/extensions/extension_service.h" 40 #include "chrome/browser/extensions/extension_service.h"
42 #include "chrome/browser/extensions/extensions_startup.h" 41 #include "chrome/browser/extensions/extensions_startup.h"
43 #include "chrome/browser/first_run/first_run.h" 42 #include "chrome/browser/first_run/first_run.h"
44 #include "chrome/browser/jankometer.h" 43 #include "chrome/browser/jankometer.h"
45 #include "chrome/browser/metrics/histogram_synchronizer.h" 44 #include "chrome/browser/metrics/histogram_synchronizer.h"
46 #include "chrome/browser/metrics/metrics_log.h" 45 #include "chrome/browser/metrics/metrics_log.h"
47 #include "chrome/browser/metrics/metrics_service.h" 46 #include "chrome/browser/metrics/metrics_service.h"
48 #include "chrome/browser/net/blob_url_request_job_factory.h" 47 #include "chrome/browser/net/blob_url_request_job_factory.h"
49 #include "chrome/browser/net/chrome_dns_cert_provenance_checker.h" 48 #include "chrome/browser/net/chrome_dns_cert_provenance_checker.h"
(...skipping 16 matching lines...) Expand all
66 #include "chrome/browser/renderer_host/resource_dispatcher_host.h" 65 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
67 #include "chrome/browser/search_engines/search_engine_type.h" 66 #include "chrome/browser/search_engines/search_engine_type.h"
68 #include "chrome/browser/search_engines/template_url.h" 67 #include "chrome/browser/search_engines/template_url.h"
69 #include "chrome/browser/search_engines/template_url_model.h" 68 #include "chrome/browser/search_engines/template_url_model.h"
70 #include "chrome/browser/service/service_process_control.h" 69 #include "chrome/browser/service/service_process_control.h"
71 #include "chrome/browser/service/service_process_control_manager.h" 70 #include "chrome/browser/service/service_process_control_manager.h"
72 #include "chrome/browser/shell_integration.h" 71 #include "chrome/browser/shell_integration.h"
73 #include "chrome/browser/translate/translate_manager.h" 72 #include "chrome/browser/translate/translate_manager.h"
74 #include "chrome/browser/ui/browser.h" 73 #include "chrome/browser/ui/browser.h"
75 #include "chrome/browser/ui/browser_init.h" 74 #include "chrome/browser/ui/browser_init.h"
75 #include "chrome/browser/webui/chrome_url_data_manager_backend.h"
76 #include "chrome/common/child_process.h" 76 #include "chrome/common/child_process.h"
77 #include "chrome/common/chrome_constants.h" 77 #include "chrome/common/chrome_constants.h"
78 #include "chrome/common/chrome_paths.h" 78 #include "chrome/common/chrome_paths.h"
79 #include "chrome/common/chrome_switches.h" 79 #include "chrome/common/chrome_switches.h"
80 #include "chrome/common/env_vars.h" 80 #include "chrome/common/env_vars.h"
81 #include "chrome/common/gfx_resource_provider.h" 81 #include "chrome/common/gfx_resource_provider.h"
82 #include "chrome/common/hi_res_timer_manager.h" 82 #include "chrome/common/hi_res_timer_manager.h"
83 #include "chrome/common/json_pref_store.h" 83 #include "chrome/common/json_pref_store.h"
84 #include "chrome/common/jstemplate_builder.h" 84 #include "chrome/common/jstemplate_builder.h"
85 #include "chrome/common/logging_chrome.h" 85 #include "chrome/common/logging_chrome.h"
(...skipping 1765 matching lines...) Expand 10 before | Expand all | Expand 10 after
1851 #if defined(OS_CHROMEOS) 1851 #if defined(OS_CHROMEOS)
1852 // To be precise, logout (browser shutdown) is not yet done, but the 1852 // To be precise, logout (browser shutdown) is not yet done, but the
1853 // remaining work is negligible, hence we say LogoutDone here. 1853 // remaining work is negligible, hence we say LogoutDone here.
1854 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", 1854 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
1855 false); 1855 false);
1856 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); 1856 chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
1857 #endif 1857 #endif
1858 TRACE_EVENT_END("BrowserMain", 0, 0); 1858 TRACE_EVENT_END("BrowserMain", 0, 0);
1859 return result_code; 1859 return result_code;
1860 } 1860 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_about_handler.cc ('k') | chrome/browser/browser_shutdown.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698