Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(175)

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

Issue 1887743003: Allow the component updater framework to control Origin Trials. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ef-finch
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 30 matching lines...) Expand all
41 #include "cc/base/switches.h" 41 #include "cc/base/switches.h"
42 #include "chrome/browser/about_flags.h" 42 #include "chrome/browser/about_flags.h"
43 #include "chrome/browser/after_startup_task_utils.h" 43 #include "chrome/browser/after_startup_task_utils.h"
44 #include "chrome/browser/browser_process.h" 44 #include "chrome/browser/browser_process.h"
45 #include "chrome/browser/browser_process_impl.h" 45 #include "chrome/browser/browser_process_impl.h"
46 #include "chrome/browser/browser_process_platform_part.h" 46 #include "chrome/browser/browser_process_platform_part.h"
47 #include "chrome/browser/browser_shutdown.h" 47 #include "chrome/browser/browser_shutdown.h"
48 #include "chrome/browser/chrome_browser_main_extra_parts.h" 48 #include "chrome/browser/chrome_browser_main_extra_parts.h"
49 #include "chrome/browser/component_updater/cld_component_installer.h" 49 #include "chrome/browser/component_updater/cld_component_installer.h"
50 #include "chrome/browser/component_updater/ev_whitelist_component_installer.h" 50 #include "chrome/browser/component_updater/ev_whitelist_component_installer.h"
51 #include "chrome/browser/component_updater/origin_trials_component_installer.h"
51 #include "chrome/browser/component_updater/pepper_flash_component_installer.h" 52 #include "chrome/browser/component_updater/pepper_flash_component_installer.h"
52 #include "chrome/browser/component_updater/recovery_component_installer.h" 53 #include "chrome/browser/component_updater/recovery_component_installer.h"
53 #include "chrome/browser/component_updater/sth_set_component_installer.h" 54 #include "chrome/browser/component_updater/sth_set_component_installer.h"
54 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h " 55 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h "
55 #include "chrome/browser/component_updater/swiftshader_component_installer.h" 56 #include "chrome/browser/component_updater/swiftshader_component_installer.h"
56 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" 57 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h"
57 #include "chrome/browser/defaults.h" 58 #include "chrome/browser/defaults.h"
58 #include "chrome/browser/first_run/first_run.h" 59 #include "chrome/browser/first_run/first_run.h"
59 #include "chrome/browser/gpu/gl_string_manager.h" 60 #include "chrome/browser/gpu/gl_string_manager.h"
60 #include "chrome/browser/gpu/three_d_api_observer.h" 61 #include "chrome/browser/gpu/three_d_api_observer.h"
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 // Registration of the EV Whitelist component here is not necessary for: 489 // Registration of the EV Whitelist component here is not necessary for:
489 // 1. Android: Because it currently does not have the EV indicator. 490 // 1. Android: Because it currently does not have the EV indicator.
490 // 2. Chrome OS: On Chrome OS this registration is delayed until user login. 491 // 2. Chrome OS: On Chrome OS this registration is delayed until user login.
491 RegisterEVWhitelistComponent(cus, path); 492 RegisterEVWhitelistComponent(cus, path);
492 493
493 // Registration of the STH set fetcher here is not done for: 494 // Registration of the STH set fetcher here is not done for:
494 // Android: Because the story around CT on Mobile is not finalized yet. 495 // Android: Because the story around CT on Mobile is not finalized yet.
495 // Chrome OS: On Chrome OS this registration is delayed until user login. 496 // Chrome OS: On Chrome OS this registration is delayed until user login.
496 RegisterSTHSetComponent(cus, path); 497 RegisterSTHSetComponent(cus, path);
497 #endif // defined(OS_ANDROID) 498 #endif // defined(OS_ANDROID)
499 RegisterOriginTrialsComponent(cus, path);
498 } 500 }
499 501
500 #if defined(OS_WIN) 502 #if defined(OS_WIN)
501 #if defined(GOOGLE_CHROME_BUILD) 503 #if defined(GOOGLE_CHROME_BUILD)
502 RegisterSwReporterComponent(cus); 504 RegisterSwReporterComponent(cus);
503 #endif // defined(GOOGLE_CHROME_BUILD) 505 #endif // defined(GOOGLE_CHROME_BUILD)
504 RegisterCAPSComponent(cus); 506 RegisterCAPSComponent(cus);
505 #endif // defined(OS_WIN) 507 #endif // defined(OS_WIN)
506 } 508 }
507 509
(...skipping 1435 matching lines...) Expand 10 before | Expand all | Expand 10 after
1943 chromeos::CrosSettings::Shutdown(); 1945 chromeos::CrosSettings::Shutdown();
1944 #endif // defined(OS_CHROMEOS) 1946 #endif // defined(OS_CHROMEOS)
1945 #endif // defined(OS_ANDROID) 1947 #endif // defined(OS_ANDROID)
1946 } 1948 }
1947 1949
1948 // Public members: 1950 // Public members:
1949 1951
1950 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1952 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1951 chrome_extra_parts_.push_back(parts); 1953 chrome_extra_parts_.push_back(parts);
1952 } 1954 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698