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

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 1353933002: NetworkPortalDetectorInterface class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@portal_refactor
Patch Set: rebase Created 5 years, 3 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/chromeos/chrome_browser_main_chromeos.h" 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_switches.h" 10 #include "ash/ash_switches.h"
(...skipping 532 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 if (!chromeos::ProfileHelper::IsSigninProfile(profile())) 543 if (!chromeos::ProfileHelper::IsSigninProfile(profile()))
544 chromeos::ProfileHelper::GetSigninProfile(); 544 chromeos::ProfileHelper::GetSigninProfile();
545 545
546 BootTimesRecorder::Get()->OnChromeProcessStart(); 546 BootTimesRecorder::Get()->OnChromeProcessStart();
547 547
548 // Initialize the network portal detector for Chrome OS. The network 548 // Initialize the network portal detector for Chrome OS. The network
549 // portal detector starts to listen for notifications from 549 // portal detector starts to listen for notifications from
550 // NetworkStateHandler and initiates captive portal detection for 550 // NetworkStateHandler and initiates captive portal detection for
551 // active networks. Should be called before call to CreateSessionManager, 551 // active networks. Should be called before call to CreateSessionManager,
552 // because it depends on NetworkPortalDetector. 552 // because it depends on NetworkPortalDetector.
553 NetworkPortalDetectorImpl::Initialize( 553 InitializeNetworkPortalDetector(g_browser_process->system_request_context());
554 g_browser_process->system_request_context());
555 { 554 {
556 #if defined(GOOGLE_CHROME_BUILD) 555 #if defined(GOOGLE_CHROME_BUILD)
557 bool is_official_build = true; 556 bool is_official_build = true;
558 #else 557 #else
559 bool is_official_build = false; 558 bool is_official_build = false;
560 #endif 559 #endif
561 // Enable portal detector if EULA was previously accepted or if 560 // Enable portal detector if EULA was previously accepted or if
562 // this is an unofficial build. 561 // this is an unofficial build.
563 if (!is_official_build || StartupUtils::IsEulaAccepted()) 562 if (!is_official_build || StartupUtils::IsEulaAccepted())
564 NetworkPortalDetector::Get()->Enable(true); 563 NetworkPortalDetector::Get()->Enable(true);
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
772 // Destroy DBus services immediately after threads are stopped. 771 // Destroy DBus services immediately after threads are stopped.
773 dbus_services_.reset(); 772 dbus_services_.reset();
774 773
775 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 774 ChromeBrowserMainPartsLinux::PostDestroyThreads();
776 775
777 // Destroy DeviceSettingsService after g_browser_process. 776 // Destroy DeviceSettingsService after g_browser_process.
778 DeviceSettingsService::Shutdown(); 777 DeviceSettingsService::Shutdown();
779 } 778 }
780 779
781 } // namespace chromeos 780 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698