Chromium Code Reviews

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

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
« no previous file with comments | « chrome/browser/browser_init.cc ('k') | chrome/browser/browser_process_impl.cc » ('j') | chrome/chrome_browser.gypi » ('J')
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 15 matching lines...)
26 #include "base/string_util.h" 26 #include "base/string_util.h"
27 #include "base/sys_string_conversions.h" 27 #include "base/sys_string_conversions.h"
28 #include "base/time.h" 28 #include "base/time.h"
29 #include "base/trace_event.h" 29 #include "base/trace_event.h"
30 #include "base/utf_string_conversions.h" 30 #include "base/utf_string_conversions.h"
31 #include "base/values.h" 31 #include "base/values.h"
32 #include "build/build_config.h" 32 #include "build/build_config.h"
33 #include "chrome/browser/browser.h" 33 #include "chrome/browser/browser.h"
34 #include "chrome/browser/browser_main_win.h" 34 #include "chrome/browser/browser_main_win.h"
35 #include "chrome/browser/browser_init.h" 35 #include "chrome/browser/browser_init.h"
36 #include "chrome/browser/browser_prefs.h" 36 #include "chrome/browser/prefs/browser_prefs.h"
37 #include "chrome/browser/browser_process.h" 37 #include "chrome/browser/browser_process.h"
38 #include "chrome/browser/browser_process_impl.h" 38 #include "chrome/browser/browser_process_impl.h"
39 #include "chrome/browser/browser_shutdown.h" 39 #include "chrome/browser/browser_shutdown.h"
40 #include "chrome/browser/chrome_thread.h" 40 #include "chrome/browser/chrome_thread.h"
41 #include "chrome/browser/dom_ui/chrome_url_data_manager.h" 41 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
42 #include "chrome/browser/extensions/extension_protocols.h" 42 #include "chrome/browser/extensions/extension_protocols.h"
43 #include "chrome/browser/extensions/extensions_service.h" 43 #include "chrome/browser/extensions/extensions_service.h"
44 #include "chrome/browser/first_run/first_run.h" 44 #include "chrome/browser/first_run/first_run.h"
45 #include "chrome/browser/jankometer.h" 45 #include "chrome/browser/jankometer.h"
46 #include "chrome/browser/metrics/histogram_synchronizer.h" 46 #include "chrome/browser/metrics/histogram_synchronizer.h"
47 #include "chrome/browser/metrics/metrics_log.h" 47 #include "chrome/browser/metrics/metrics_log.h"
48 #include "chrome/browser/metrics/metrics_service.h" 48 #include "chrome/browser/metrics/metrics_service.h"
49 #include "chrome/browser/net/predictor_api.h" 49 #include "chrome/browser/net/predictor_api.h"
50 #include "chrome/browser/net/metadata_url_request.h" 50 #include "chrome/browser/net/metadata_url_request.h"
51 #include "chrome/browser/net/sdch_dictionary_fetcher.h" 51 #include "chrome/browser/net/sdch_dictionary_fetcher.h"
52 #include "chrome/browser/net/websocket_experiment/websocket_experiment_runner.h" 52 #include "chrome/browser/net/websocket_experiment/websocket_experiment_runner.h"
53 #include "chrome/browser/plugin_service.h" 53 #include "chrome/browser/plugin_service.h"
54 #include "chrome/browser/pref_service.h" 54 #include "chrome/browser/prefs/pref_service.h"
55 #include "chrome/browser/pref_value_store.h" 55 #include "chrome/browser/prefs/pref_value_store.h"
56 #include "chrome/browser/process_singleton.h" 56 #include "chrome/browser/process_singleton.h"
57 #include "chrome/browser/profile.h" 57 #include "chrome/browser/profile.h"
58 #include "chrome/browser/profile_manager.h" 58 #include "chrome/browser/profile_manager.h"
59 #include "chrome/browser/renderer_host/resource_dispatcher_host.h" 59 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
60 #include "chrome/browser/search_engines/template_url_model.h" 60 #include "chrome/browser/search_engines/template_url_model.h"
61 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 61 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
62 #include "chrome/browser/service/service_process_control.h" 62 #include "chrome/browser/service/service_process_control.h"
63 #include "chrome/browser/service/service_process_control_manager.h" 63 #include "chrome/browser/service/service_process_control_manager.h"
64 #include "chrome/browser/shell_integration.h" 64 #include "chrome/browser/shell_integration.h"
65 #include "chrome/browser/translate/translate_manager.h" 65 #include "chrome/browser/translate/translate_manager.h"
(...skipping 1426 matching lines...)
1492 metrics->Stop(); 1492 metrics->Stop();
1493 1493
1494 // browser_shutdown takes care of deleting browser_process, so we need to 1494 // browser_shutdown takes care of deleting browser_process, so we need to
1495 // release it. 1495 // release it.
1496 ignore_result(browser_process.release()); 1496 ignore_result(browser_process.release());
1497 browser_shutdown::Shutdown(); 1497 browser_shutdown::Shutdown();
1498 1498
1499 TRACE_EVENT_END("BrowserMain", 0, 0); 1499 TRACE_EVENT_END("BrowserMain", 0, 0);
1500 return result_code; 1500 return result_code;
1501 } 1501 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_init.cc ('k') | chrome/browser/browser_process_impl.cc » ('j') | chrome/chrome_browser.gypi » ('J')

Powered by Google App Engine