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

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

Issue 657613002: Certificate Transparency: EV certificates whitelist support for ChromeOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ev_list_unpacking_redo
Patch Set: Adding missing include Created 6 years, 1 month 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 <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 if (PathService::Get(chrome::DIR_USER_DATA, &path)) { 424 if (PathService::Get(chrome::DIR_USER_DATA, &path)) {
425 #if defined(OS_ANDROID) 425 #if defined(OS_ANDROID)
426 // The CRLSet component was enabled for some releases. This code attempts to 426 // The CRLSet component was enabled for some releases. This code attempts to
427 // delete it from the local disk of those how may have downloaded it. 427 // delete it from the local disk of those how may have downloaded it.
428 g_browser_process->crl_set_fetcher()->DeleteFromDisk(path); 428 g_browser_process->crl_set_fetcher()->DeleteFromDisk(path);
429 #elif !defined(OS_CHROMEOS) 429 #elif !defined(OS_CHROMEOS)
430 // CRLSetFetcher attempts to load a CRL set from either the local disk or 430 // CRLSetFetcher attempts to load a CRL set from either the local disk or
431 // network. 431 // network.
432 // For Chrome OS this registration is delayed until user login. 432 // For Chrome OS this registration is delayed until user login.
433 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus, path); 433 g_browser_process->crl_set_fetcher()->StartInitialLoad(cus, path);
434 // Android does not currently have the EV indicator. No need to get the
Sorin Jianu 2014/11/07 17:30:44 Can you please clarify the comment?
Eran Messeri 2014/11/10 22:54:56 Done.
435 // EV certs whitelist on Android, then.
436 // For Chrome OS this registration is delayed until user login.
437 RegisterEVWhitelistComponent(cus, path);
434 #endif 438 #endif
435 } 439 }
436 440
437 #if !defined(OS_ANDROID)
438 // Android does not currently have the EV indicator. No need to get the
439 // EV certs whitelist on Android, then.
440 RegisterEVWhitelistComponent(cus);
441 #endif
442
443 #if defined(OS_WIN) 441 #if defined(OS_WIN)
444 RegisterSwReporterComponent(cus, g_browser_process->local_state()); 442 RegisterSwReporterComponent(cus, g_browser_process->local_state());
445 #endif 443 #endif
446 444
447 cus->Start(); 445 cus->Start();
448 } 446 }
449 447
450 #if !defined(OS_ANDROID) 448 #if !defined(OS_ANDROID)
451 bool ProcessSingletonNotificationCallback( 449 bool ProcessSingletonNotificationCallback(
452 const CommandLine& command_line, 450 const CommandLine& command_line,
(...skipping 1246 matching lines...) Expand 10 before | Expand all | Expand 10 after
1699 chromeos::CrosSettings::Shutdown(); 1697 chromeos::CrosSettings::Shutdown();
1700 #endif 1698 #endif
1701 #endif 1699 #endif
1702 } 1700 }
1703 1701
1704 // Public members: 1702 // Public members:
1705 1703
1706 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1704 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1707 chrome_extra_parts_.push_back(parts); 1705 chrome_extra_parts_.push_back(parts);
1708 } 1706 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698