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

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

Issue 391783003: Enabling CRLSet for ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Tidy ifdefs Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/users/user_manager_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 RegisterPepperFlashComponent(cus); 392 RegisterPepperFlashComponent(cus);
393 RegisterSwiftShaderComponent(cus); 393 RegisterSwiftShaderComponent(cus);
394 g_browser_process->pnacl_component_installer()->RegisterPnaclComponent(cus); 394 g_browser_process->pnacl_component_installer()->RegisterPnaclComponent(cus);
395 RegisterWidevineCdmComponent(cus); 395 RegisterWidevineCdmComponent(cus);
396 #endif 396 #endif
397 397
398 #if defined(CLD_DATA_FROM_COMPONENT) 398 #if defined(CLD_DATA_FROM_COMPONENT)
399 RegisterCldComponent(cus); 399 RegisterCldComponent(cus);
400 #endif 400 #endif
401 401
402 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) 402 base::FilePath path;
403 // CRLSetFetcher attempts to load a CRL set from either the local disk or 403 if (PathService::Get(chrome::DIR_USER_DATA, &path)) {
404 // network. 404 #if defined(OS_ANDROID)
405 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus); 405 // The CRLSet component was enabled for some releases. This code attempts to
406 #elif defined(OS_ANDROID) 406 // delete it from the local disk of those how may have downloaded it.
407 // The CRLSet component was enabled for some releases. This code attempts to 407 g_browser_process->crl_set_fetcher()->DeleteFromDisk(path);
408 // delete it from the local disk of those how may have downloaded it. 408 #elif !defined(OS_CHROMEOS)
409 g_browser_process->crl_set_fetcher()->DeleteFromDisk(); 409 // CRLSetFetcher attempts to load a CRL set from either the local disk or
410 // network.
411 // For Chrome OS this registration is delayed until user login.
412 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus, path);
410 #endif 413 #endif
414 }
411 415
412 #if defined(OS_WIN) 416 #if defined(OS_WIN)
413 ExecutePendingSwReporter(cus, g_browser_process->local_state()); 417 ExecutePendingSwReporter(cus, g_browser_process->local_state());
414 #endif 418 #endif
415 419
416 cus->Start(); 420 cus->Start();
417 } 421 }
418 422
419 #if !defined(OS_ANDROID) 423 #if !defined(OS_ANDROID)
420 bool ProcessSingletonNotificationCallback( 424 bool ProcessSingletonNotificationCallback(
(...skipping 1228 matching lines...) Expand 10 before | Expand all | Expand 10 after
1649 chromeos::CrosSettings::Shutdown(); 1653 chromeos::CrosSettings::Shutdown();
1650 #endif 1654 #endif
1651 #endif 1655 #endif
1652 } 1656 }
1653 1657
1654 // Public members: 1658 // Public members:
1655 1659
1656 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1660 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1657 chrome_extra_parts_.push_back(parts); 1661 chrome_extra_parts_.push_back(parts);
1658 } 1662 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/users/user_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698