| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/chrome_browser_main.h" | 5 #include "chrome/browser/chrome_browser_main.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 #include "chrome/browser/first_run/first_run.h" | 58 #include "chrome/browser/first_run/first_run.h" |
| 59 #include "chrome/browser/first_run/upgrade_util.h" | 59 #include "chrome/browser/first_run/upgrade_util.h" |
| 60 #include "chrome/browser/gpu/gl_string_manager.h" | 60 #include "chrome/browser/gpu/gl_string_manager.h" |
| 61 #include "chrome/browser/gpu/three_d_api_observer.h" | 61 #include "chrome/browser/gpu/three_d_api_observer.h" |
| 62 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 62 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
| 63 #include "chrome/browser/memory/oom_priority_manager.h" | 63 #include "chrome/browser/memory/oom_priority_manager.h" |
| 64 #include "chrome/browser/metrics/field_trial_synchronizer.h" | 64 #include "chrome/browser/metrics/field_trial_synchronizer.h" |
| 65 #include "chrome/browser/metrics/metrics_services_manager.h" | 65 #include "chrome/browser/metrics/metrics_services_manager.h" |
| 66 #include "chrome/browser/metrics/thread_watcher.h" | 66 #include "chrome/browser/metrics/thread_watcher.h" |
| 67 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" | 67 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" |
| 68 #include "chrome/browser/net/chrome_net_log.h" | |
| 69 #include "chrome/browser/net/crl_set_fetcher.h" | 68 #include "chrome/browser/net/crl_set_fetcher.h" |
| 70 #include "chrome/browser/performance_monitor/performance_monitor.h" | 69 #include "chrome/browser/performance_monitor/performance_monitor.h" |
| 71 #include "chrome/browser/plugins/plugin_prefs.h" | 70 #include "chrome/browser/plugins/plugin_prefs.h" |
| 72 #include "chrome/browser/power/process_power_collector.h" | 71 #include "chrome/browser/power/process_power_collector.h" |
| 73 #include "chrome/browser/pref_service_flags_storage.h" | 72 #include "chrome/browser/pref_service_flags_storage.h" |
| 74 #include "chrome/browser/prefs/chrome_pref_service_factory.h" | 73 #include "chrome/browser/prefs/chrome_pref_service_factory.h" |
| 75 #include "chrome/browser/prefs/command_line_pref_store.h" | 74 #include "chrome/browser/prefs/command_line_pref_store.h" |
| 76 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 75 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
| 77 #include "chrome/browser/prefs/pref_metrics_service.h" | 76 #include "chrome/browser/prefs/pref_metrics_service.h" |
| 78 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" | 77 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" |
| (...skipping 1759 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1838 chromeos::CrosSettings::Shutdown(); | 1837 chromeos::CrosSettings::Shutdown(); |
| 1839 #endif // defined(OS_CHROMEOS) | 1838 #endif // defined(OS_CHROMEOS) |
| 1840 #endif // defined(OS_ANDROID) | 1839 #endif // defined(OS_ANDROID) |
| 1841 } | 1840 } |
| 1842 | 1841 |
| 1843 // Public members: | 1842 // Public members: |
| 1844 | 1843 |
| 1845 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1844 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1846 chrome_extra_parts_.push_back(parts); | 1845 chrome_extra_parts_.push_back(parts); |
| 1847 } | 1846 } |
| OLD | NEW |