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

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

Issue 2581903002: Add SSL error assistant component to dynamically update captive portal list (Closed)
Patch Set: nparker comments 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 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 231
232 #if !defined(DISABLE_NACL) 232 #if !defined(DISABLE_NACL)
233 #include "chrome/browser/component_updater/pnacl_component_installer.h" 233 #include "chrome/browser/component_updater/pnacl_component_installer.h"
234 #include "components/nacl/browser/nacl_process_host.h" 234 #include "components/nacl/browser/nacl_process_host.h"
235 #endif // !defined(DISABLE_NACL) 235 #endif // !defined(DISABLE_NACL)
236 236
237 #if BUILDFLAG(ENABLE_BACKGROUND) 237 #if BUILDFLAG(ENABLE_BACKGROUND)
238 #include "chrome/browser/background/background_mode_manager.h" 238 #include "chrome/browser/background/background_mode_manager.h"
239 #endif // BUILDFLAG(ENABLE_BACKGROUND) 239 #endif // BUILDFLAG(ENABLE_BACKGROUND)
240 240
241 #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
242 #include "chrome/browser/component_updater/ssl_error_assistant_component_install er.h"
243 #endif // BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
244
241 #if BUILDFLAG(ENABLE_EXTENSIONS) 245 #if BUILDFLAG(ENABLE_EXTENSIONS)
242 #include "chrome/browser/extensions/startup_helper.h" 246 #include "chrome/browser/extensions/startup_helper.h"
243 #include "extensions/browser/extension_protocols.h" 247 #include "extensions/browser/extension_protocols.h"
244 #include "extensions/common/features/feature_provider.h" 248 #include "extensions/common/features/feature_provider.h"
245 #include "extensions/components/javascript_dialog_extensions_client/javascript_d ialog_extension_client_impl.h" 249 #include "extensions/components/javascript_dialog_extensions_client/javascript_d ialog_extension_client_impl.h"
246 #endif // BUILDFLAG(ENABLE_EXTENSIONS) 250 #endif // BUILDFLAG(ENABLE_EXTENSIONS)
247 251
248 #if BUILDFLAG(ENABLE_PRINT_PREVIEW) && !defined(OFFICIAL_BUILD) 252 #if BUILDFLAG(ENABLE_PRINT_PREVIEW) && !defined(OFFICIAL_BUILD)
249 #include "printing/printed_document.h" 253 #include "printing/printed_document.h"
250 #endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) && !defined(OFFICIAL_BUILD) 254 #endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) && !defined(OFFICIAL_BUILD)
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
517 RegisterEVWhitelistComponent(cus, path); 521 RegisterEVWhitelistComponent(cus, path);
518 522
519 // Registration of the STH set fetcher here is not done for: 523 // Registration of the STH set fetcher here is not done for:
520 // Android: Because the story around CT on Mobile is not finalized yet. 524 // Android: Because the story around CT on Mobile is not finalized yet.
521 // Chrome OS: On Chrome OS this registration is delayed until user login. 525 // Chrome OS: On Chrome OS this registration is delayed until user login.
522 RegisterSTHSetComponent(cus, path); 526 RegisterSTHSetComponent(cus, path);
523 #endif // defined(OS_ANDROID) 527 #endif // defined(OS_ANDROID)
524 RegisterOriginTrialsComponent(cus, path); 528 RegisterOriginTrialsComponent(cus, path);
525 529
526 RegisterFileTypePoliciesComponent(cus, path); 530 RegisterFileTypePoliciesComponent(cus, path);
531
532 #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
533 RegisterSSLErrorAssistantComponent(cus, path);
534 #endif
527 } 535 }
528 536
529 #if defined(OS_WIN) 537 #if defined(OS_WIN)
530 #if defined(GOOGLE_CHROME_BUILD) 538 #if defined(GOOGLE_CHROME_BUILD)
531 RegisterSwReporterComponent(cus); 539 RegisterSwReporterComponent(cus);
532 #endif // defined(GOOGLE_CHROME_BUILD) 540 #endif // defined(GOOGLE_CHROME_BUILD)
533 #endif // defined(OS_WIN) 541 #endif // defined(OS_WIN)
534 } 542 }
535 543
536 #if !defined(OS_ANDROID) 544 #if !defined(OS_ANDROID)
(...skipping 1573 matching lines...) Expand 10 before | Expand all | Expand 10 after
2110 chromeos::CrosSettings::Shutdown(); 2118 chromeos::CrosSettings::Shutdown();
2111 #endif // defined(OS_CHROMEOS) 2119 #endif // defined(OS_CHROMEOS)
2112 #endif // defined(OS_ANDROID) 2120 #endif // defined(OS_ANDROID)
2113 } 2121 }
2114 2122
2115 // Public members: 2123 // Public members:
2116 2124
2117 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 2125 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
2118 chrome_extra_parts_.push_back(parts); 2126 chrome_extra_parts_.push_back(parts);
2119 } 2127 }
OLDNEW
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/component_updater/ssl_error_assistant_component_installer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698