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

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

Issue 2661113003: Skeleton mechanical impl. for the RecoveryImprovedComponent. (Closed)
Patch Set: wip Created 3 years, 10 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 9
10 #include <set> 10 #include <set>
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
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/ev_whitelist_component_installer.h" 51 #include "chrome/browser/component_updater/ev_whitelist_component_installer.h"
52 #include "chrome/browser/component_updater/file_type_policies_component_installe r.h" 52 #include "chrome/browser/component_updater/file_type_policies_component_installe r.h"
53 #include "chrome/browser/component_updater/origin_trials_component_installer.h" 53 #include "chrome/browser/component_updater/origin_trials_component_installer.h"
54 #include "chrome/browser/component_updater/pepper_flash_component_installer.h" 54 #include "chrome/browser/component_updater/pepper_flash_component_installer.h"
55 #include "chrome/browser/component_updater/recovery_component_installer.h" 55 #include "chrome/browser/component_updater/recovery_component_installer.h"
56 #include "chrome/browser/component_updater/recovery_improved_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/subresource_filter_component_installe r.h" 58 #include "chrome/browser/component_updater/subresource_filter_component_installe r.h"
58 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h " 59 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h "
59 #include "chrome/browser/component_updater/swiftshader_component_installer.h" 60 #include "chrome/browser/component_updater/swiftshader_component_installer.h"
60 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" 61 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h"
61 #include "chrome/browser/defaults.h" 62 #include "chrome/browser/defaults.h"
62 #include "chrome/browser/first_run/first_run.h" 63 #include "chrome/browser/first_run/first_run.h"
63 #include "chrome/browser/geolocation/chrome_access_token_store.h" 64 #include "chrome/browser/geolocation/chrome_access_token_store.h"
64 #include "chrome/browser/gpu/gpu_profile_cache.h" 65 #include "chrome/browser/gpu/gpu_profile_cache.h"
65 #include "chrome/browser/gpu/three_d_api_observer.h" 66 #include "chrome/browser/gpu/three_d_api_observer.h"
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
468 469
469 void RegisterComponentsForUpdate() { 470 void RegisterComponentsForUpdate() {
470 component_updater::ComponentUpdateService* cus = 471 component_updater::ComponentUpdateService* cus =
471 g_browser_process->component_updater(); 472 g_browser_process->component_updater();
472 473
473 // Registration can be before or after cus->Start() so it is ok to post 474 // Registration can be before or after cus->Start() so it is ok to post
474 // a task to the UI thread to do registration once you done the necessary 475 // a task to the UI thread to do registration once you done the necessary
475 // file IO to know you existing component version. 476 // file IO to know you existing component version.
476 #if !defined(OS_ANDROID) 477 #if !defined(OS_ANDROID)
477 #if !defined(OS_CHROMEOS) 478 #if !defined(OS_CHROMEOS)
478 RegisterRecoveryComponent(cus, g_browser_process->local_state()); 479 if (base::FeatureList::IsEnabled(features::kImprovedRecoveryComponent))
480 RegisterRecoveryImprovedComponent(cus, g_browser_process->local_state());
481 else
482 RegisterRecoveryComponent(cus, g_browser_process->local_state());
479 #endif // !defined(OS_CHROMEOS) 483 #endif // !defined(OS_CHROMEOS)
480 RegisterPepperFlashComponent(cus); 484 RegisterPepperFlashComponent(cus);
481 #if !defined(OS_CHROMEOS) 485 #if !defined(OS_CHROMEOS)
482 RegisterSwiftShaderComponent(cus); 486 RegisterSwiftShaderComponent(cus);
483 RegisterWidevineCdmComponent(cus); 487 RegisterWidevineCdmComponent(cus);
484 #endif // !defined(OS_CHROMEOS) 488 #endif // !defined(OS_CHROMEOS)
485 #endif // !defined(OS_ANDROID) 489 #endif // !defined(OS_ANDROID)
486 490
487 #if !defined(DISABLE_NACL) && !defined(OS_ANDROID) 491 #if !defined(DISABLE_NACL) && !defined(OS_ANDROID)
488 #if defined(OS_CHROMEOS) 492 #if defined(OS_CHROMEOS)
(...skipping 1621 matching lines...) Expand 10 before | Expand all | Expand 10 after
2110 chromeos::CrosSettings::Shutdown(); 2114 chromeos::CrosSettings::Shutdown();
2111 #endif // defined(OS_CHROMEOS) 2115 #endif // defined(OS_CHROMEOS)
2112 #endif // defined(OS_ANDROID) 2116 #endif // defined(OS_ANDROID)
2113 } 2117 }
2114 2118
2115 // Public members: 2119 // Public members:
2116 2120
2117 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 2121 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
2118 chrome_extra_parts_.push_back(parts); 2122 chrome_extra_parts_.push_back(parts);
2119 } 2123 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698