chrome/browser/chromeos/net/network_portal_notification_controller.cc - Issue 242483003: Move CaptivePortalDetector to src/components/captive_portal

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/net/network_portal_notification_controller.cc

Issue 242483003: Move CaptivePortalDetector to src/components/captive_portal (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Move CaptivePortalDetector to a component Created 6 years, 8 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/captive_portal/captive_portal_service.cc ('K') | « chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc ('k') | chrome/browser/chromeos/net/network_portal_notification_controller_unittest.cc » ('j') | components/captive_portal/captive_portal_detector.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/net/network_portal_notification_controller.cc

diff --git a/chrome/browser/chromeos/net/network_portal_notification_controller.cc b/chrome/browser/chromeos/net/network_portal_notification_controller.cc

index 579c2f96a5283afcb057b4813f144c8c66306f86..b735f3f71869adc52fd7bf8d9b7cde243367e362 100644

--- a/chrome/browser/chromeos/net/network_portal_notification_controller.cc

+++ b/chrome/browser/chromeos/net/network_portal_notification_controller.cc

@@ -15,12 +15,12 @@

#include "base/metrics/histogram.h"

#include "base/strings/string16.h"

#include "base/strings/utf_string_conversions.h"

-#include "chrome/browser/captive_portal/captive_portal_detector.h"

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"

#include "chrome/browser/ui/singleton_tabs.h"

#include "chromeos/chromeos_switches.h"

#include "chromeos/network/network_state.h"

+#include "components/captive_portal/captive_portal_detector.h"

#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

#include "ui/base/l10n/l10n_util.h"

@@ -136,7 +136,7 @@ void NetworkPortalNotificationController::OnPortalDetectionCompleted(

return;

if (!network ||

- state.status != NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL) {

+ state.status != captive_portal::CAPTIVE_PORTAL_STATUS_PORTAL) {

last_network_path_.clear();

CloseNotification();

return;