| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <set> | 10 #include <set> |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 #include "base/values.h" | 40 #include "base/values.h" |
| 41 #include "build/build_config.h" | 41 #include "build/build_config.h" |
| 42 #include "cc/base/switches.h" | 42 #include "cc/base/switches.h" |
| 43 #include "chrome/browser/about_flags.h" | 43 #include "chrome/browser/about_flags.h" |
| 44 #include "chrome/browser/after_startup_task_utils.h" | 44 #include "chrome/browser/after_startup_task_utils.h" |
| 45 #include "chrome/browser/browser_process.h" | 45 #include "chrome/browser/browser_process.h" |
| 46 #include "chrome/browser/browser_process_impl.h" | 46 #include "chrome/browser/browser_process_impl.h" |
| 47 #include "chrome/browser/browser_process_platform_part.h" | 47 #include "chrome/browser/browser_process_platform_part.h" |
| 48 #include "chrome/browser/browser_shutdown.h" | 48 #include "chrome/browser/browser_shutdown.h" |
| 49 #include "chrome/browser/chrome_browser_main_extra_parts.h" | 49 #include "chrome/browser/chrome_browser_main_extra_parts.h" |
| 50 #include "chrome/browser/component_updater/cld_component_installer.h" | |
| 51 #include "chrome/browser/component_updater/ev_whitelist_component_installer.h" | 50 #include "chrome/browser/component_updater/ev_whitelist_component_installer.h" |
| 52 #include "chrome/browser/component_updater/file_type_policies_component_installe
r.h" | 51 #include "chrome/browser/component_updater/file_type_policies_component_installe
r.h" |
| 53 #include "chrome/browser/component_updater/origin_trials_component_installer.h" | 52 #include "chrome/browser/component_updater/origin_trials_component_installer.h" |
| 54 #include "chrome/browser/component_updater/pepper_flash_component_installer.h" | 53 #include "chrome/browser/component_updater/pepper_flash_component_installer.h" |
| 55 #include "chrome/browser/component_updater/recovery_component_installer.h" | 54 #include "chrome/browser/component_updater/recovery_component_installer.h" |
| 56 #include "chrome/browser/component_updater/sth_set_component_installer.h" | 55 #include "chrome/browser/component_updater/sth_set_component_installer.h" |
| 57 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h
" | 56 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h
" |
| 58 #include "chrome/browser/component_updater/swiftshader_component_installer.h" | 57 #include "chrome/browser/component_updater/swiftshader_component_installer.h" |
| 59 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" | 58 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" |
| 60 #include "chrome/browser/defaults.h" | 59 #include "chrome/browser/defaults.h" |
| (...skipping 1985 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2046 chromeos::CrosSettings::Shutdown(); | 2045 chromeos::CrosSettings::Shutdown(); |
| 2047 #endif // defined(OS_CHROMEOS) | 2046 #endif // defined(OS_CHROMEOS) |
| 2048 #endif // defined(OS_ANDROID) | 2047 #endif // defined(OS_ANDROID) |
| 2049 } | 2048 } |
| 2050 | 2049 |
| 2051 // Public members: | 2050 // Public members: |
| 2052 | 2051 |
| 2053 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 2052 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 2054 chrome_extra_parts_.push_back(parts); | 2053 chrome_extra_parts_.push_back(parts); |
| 2055 } | 2054 } |
| OLD | NEW |