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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 #include "cc/base/switches.h" | 43 #include "cc/base/switches.h" |
44 #include "chrome/browser/about_flags.h" | 44 #include "chrome/browser/about_flags.h" |
45 #include "chrome/browser/after_startup_task_utils.h" | 45 #include "chrome/browser/after_startup_task_utils.h" |
46 #include "chrome/browser/browser_process.h" | 46 #include "chrome/browser/browser_process.h" |
47 #include "chrome/browser/browser_process_impl.h" | 47 #include "chrome/browser/browser_process_impl.h" |
48 #include "chrome/browser/browser_process_platform_part.h" | 48 #include "chrome/browser/browser_process_platform_part.h" |
49 #include "chrome/browser/browser_shutdown.h" | 49 #include "chrome/browser/browser_shutdown.h" |
50 #include "chrome/browser/chrome_browser_main_extra_parts.h" | 50 #include "chrome/browser/chrome_browser_main_extra_parts.h" |
51 #include "chrome/browser/component_updater/cld_component_installer.h" | 51 #include "chrome/browser/component_updater/cld_component_installer.h" |
52 #include "chrome/browser/component_updater/ev_whitelist_component_installer.h" | 52 #include "chrome/browser/component_updater/ev_whitelist_component_installer.h" |
| 53 #include "chrome/browser/component_updater/file_type_policies_component_installe
r.h" |
53 #include "chrome/browser/component_updater/origin_trials_component_installer.h" | 54 #include "chrome/browser/component_updater/origin_trials_component_installer.h" |
54 #include "chrome/browser/component_updater/pepper_flash_component_installer.h" | 55 #include "chrome/browser/component_updater/pepper_flash_component_installer.h" |
55 #include "chrome/browser/component_updater/recovery_component_installer.h" | 56 #include "chrome/browser/component_updater/recovery_component_installer.h" |
56 #include "chrome/browser/component_updater/sth_set_component_installer.h" | 57 #include "chrome/browser/component_updater/sth_set_component_installer.h" |
57 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h
" | 58 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h
" |
58 #include "chrome/browser/component_updater/swiftshader_component_installer.h" | 59 #include "chrome/browser/component_updater/swiftshader_component_installer.h" |
59 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" | 60 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" |
60 #include "chrome/browser/defaults.h" | 61 #include "chrome/browser/defaults.h" |
61 #include "chrome/browser/first_run/first_run.h" | 62 #include "chrome/browser/first_run/first_run.h" |
62 #include "chrome/browser/gpu/gl_string_manager.h" | 63 #include "chrome/browser/gpu/gl_string_manager.h" |
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
490 // 1. Android: Because it currently does not have the EV indicator. | 491 // 1. Android: Because it currently does not have the EV indicator. |
491 // 2. Chrome OS: On Chrome OS this registration is delayed until user login. | 492 // 2. Chrome OS: On Chrome OS this registration is delayed until user login. |
492 RegisterEVWhitelistComponent(cus, path); | 493 RegisterEVWhitelistComponent(cus, path); |
493 | 494 |
494 // Registration of the STH set fetcher here is not done for: | 495 // Registration of the STH set fetcher here is not done for: |
495 // Android: Because the story around CT on Mobile is not finalized yet. | 496 // Android: Because the story around CT on Mobile is not finalized yet. |
496 // Chrome OS: On Chrome OS this registration is delayed until user login. | 497 // Chrome OS: On Chrome OS this registration is delayed until user login. |
497 RegisterSTHSetComponent(cus, path); | 498 RegisterSTHSetComponent(cus, path); |
498 #endif // defined(OS_ANDROID) | 499 #endif // defined(OS_ANDROID) |
499 RegisterOriginTrialsComponent(cus, path); | 500 RegisterOriginTrialsComponent(cus, path); |
| 501 |
| 502 RegisterFileTypePoliciesComponent(cus, path); |
500 } | 503 } |
501 | 504 |
502 #if defined(OS_WIN) | 505 #if defined(OS_WIN) |
503 #if defined(GOOGLE_CHROME_BUILD) | 506 #if defined(GOOGLE_CHROME_BUILD) |
504 RegisterSwReporterComponent(cus); | 507 RegisterSwReporterComponent(cus); |
505 #endif // defined(GOOGLE_CHROME_BUILD) | 508 #endif // defined(GOOGLE_CHROME_BUILD) |
506 RegisterCAPSComponent(cus); | 509 RegisterCAPSComponent(cus); |
507 #endif // defined(OS_WIN) | 510 #endif // defined(OS_WIN) |
508 } | 511 } |
509 | 512 |
(...skipping 1482 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1992 chromeos::CrosSettings::Shutdown(); | 1995 chromeos::CrosSettings::Shutdown(); |
1993 #endif // defined(OS_CHROMEOS) | 1996 #endif // defined(OS_CHROMEOS) |
1994 #endif // defined(OS_ANDROID) | 1997 #endif // defined(OS_ANDROID) |
1995 } | 1998 } |
1996 | 1999 |
1997 // Public members: | 2000 // Public members: |
1998 | 2001 |
1999 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 2002 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
2000 chrome_extra_parts_.push_back(parts); | 2003 chrome_extra_parts_.push_back(parts); |
2001 } | 2004 } |
OLD | NEW |