| 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/origin_trials_component_installer.h" |
| 53 #include "chrome/browser/component_updater/pepper_flash_component_installer.h" | 54 #include "chrome/browser/component_updater/pepper_flash_component_installer.h" |
| 54 #include "chrome/browser/component_updater/recovery_component_installer.h" | 55 #include "chrome/browser/component_updater/recovery_component_installer.h" |
| 55 #include "chrome/browser/component_updater/sth_set_component_installer.h" | 56 #include "chrome/browser/component_updater/sth_set_component_installer.h" |
| 56 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h
" | 57 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h
" |
| 57 #include "chrome/browser/component_updater/swiftshader_component_installer.h" | 58 #include "chrome/browser/component_updater/swiftshader_component_installer.h" |
| 58 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" | 59 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" |
| 59 #include "chrome/browser/defaults.h" | 60 #include "chrome/browser/defaults.h" |
| 60 #include "chrome/browser/first_run/first_run.h" | 61 #include "chrome/browser/first_run/first_run.h" |
| 61 #include "chrome/browser/gpu/gl_string_manager.h" | 62 #include "chrome/browser/gpu/gl_string_manager.h" |
| 62 #include "chrome/browser/gpu/three_d_api_observer.h" | 63 #include "chrome/browser/gpu/three_d_api_observer.h" |
| (...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 487 // Registration of the EV Whitelist component here is not necessary for: | 488 // Registration of the EV Whitelist component here is not necessary for: |
| 488 // 1. Android: Because it currently does not have the EV indicator. | 489 // 1. Android: Because it currently does not have the EV indicator. |
| 489 // 2. Chrome OS: On Chrome OS this registration is delayed until user login. | 490 // 2. Chrome OS: On Chrome OS this registration is delayed until user login. |
| 490 RegisterEVWhitelistComponent(cus, path); | 491 RegisterEVWhitelistComponent(cus, path); |
| 491 | 492 |
| 492 // Registration of the STH set fetcher here is not done for: | 493 // Registration of the STH set fetcher here is not done for: |
| 493 // Android: Because the story around CT on Mobile is not finalized yet. | 494 // Android: Because the story around CT on Mobile is not finalized yet. |
| 494 // Chrome OS: On Chrome OS this registration is delayed until user login. | 495 // Chrome OS: On Chrome OS this registration is delayed until user login. |
| 495 RegisterSTHSetComponent(cus, path); | 496 RegisterSTHSetComponent(cus, path); |
| 496 #endif // defined(OS_ANDROID) | 497 #endif // defined(OS_ANDROID) |
| 498 RegisterOriginTrialsComponent(cus, path); |
| 497 } | 499 } |
| 498 | 500 |
| 499 #if defined(OS_WIN) | 501 #if defined(OS_WIN) |
| 500 #if defined(GOOGLE_CHROME_BUILD) | 502 #if defined(GOOGLE_CHROME_BUILD) |
| 501 RegisterSwReporterComponent(cus); | 503 RegisterSwReporterComponent(cus); |
| 502 #endif // defined(GOOGLE_CHROME_BUILD) | 504 #endif // defined(GOOGLE_CHROME_BUILD) |
| 503 RegisterCAPSComponent(cus); | 505 RegisterCAPSComponent(cus); |
| 504 #endif // defined(OS_WIN) | 506 #endif // defined(OS_WIN) |
| 505 } | 507 } |
| 506 | 508 |
| (...skipping 1439 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1946 chromeos::CrosSettings::Shutdown(); | 1948 chromeos::CrosSettings::Shutdown(); |
| 1947 #endif // defined(OS_CHROMEOS) | 1949 #endif // defined(OS_CHROMEOS) |
| 1948 #endif // defined(OS_ANDROID) | 1950 #endif // defined(OS_ANDROID) |
| 1949 } | 1951 } |
| 1950 | 1952 |
| 1951 // Public members: | 1953 // Public members: |
| 1952 | 1954 |
| 1953 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1955 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1954 chrome_extra_parts_.push_back(parts); | 1956 chrome_extra_parts_.push_back(parts); |
| 1955 } | 1957 } |
| OLD | NEW |