chrome/browser/chromeos/login/captive_portal_view.cc - Issue 10915106: Renaming instances of "flimflam" with "shill", now that we're only

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/chromeos/login/captive_portal_view.cc

Issue 10915106: Renaming instances of "flimflam" with "shill", now that we're only (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Upload after merge Created 8 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 | « chrome/browser/chromeos/cros/sms_watcher.cc ('k') | chrome/browser/chromeos/options/wifi_config_view.cc » ('j') | no next file with comments »

OLD	NEW
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/chromeos/login/captive_portal_view.h"	5 #include "chrome/browser/chromeos/login/captive_portal_view.h"

6	6

7 #include "base/utf_string_conversions.h"	7 #include "base/utf_string_conversions.h"

8 #include "chrome/browser/chromeos/cros/cros_library.h"	8 #include "chrome/browser/chromeos/cros/cros_library.h"

9 #include "chrome/browser/chromeos/cros/network_library.h"	9 #include "chrome/browser/chromeos/cros/network_library.h"

10 #include "chrome/browser/chromeos/login/captive_portal_window_proxy.h"	10 #include "chrome/browser/chromeos/login/captive_portal_window_proxy.h"

(...skipping 63 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
74 DLOG(INFO) << kCaptivePortalStartURL << " vs " << url.spec();	74 DLOG(INFO) << kCaptivePortalStartURL << " vs " << url.spec();

75 redirected_ = true;	75 redirected_ = true;

76 proxy_->OnRedirected();	76 proxy_->OnRedirected();

77 }	77 }

78 }	78 }

79	79

80 void CaptivePortalView::LoadingStateChanged(content::WebContents* source) {	80 void CaptivePortalView::LoadingStateChanged(content::WebContents* source) {

81 SimpleWebViewDialog::LoadingStateChanged(source);	81 SimpleWebViewDialog::LoadingStateChanged(source);

82 // TODO(nkostylev): Fix case of no connectivity, check HTTP code returned.	82 // TODO(nkostylev): Fix case of no connectivity, check HTTP code returned.

83 // Disable this heuristic as it has false positives.	83 // Disable this heuristic as it has false positives.

84 // Relying on just flimflam portal check to close dialog is fine.	84 // Relying on just shill portal check to close dialog is fine.

85 // if (!is_loading && !redirected_)	85 // if (!is_loading && !redirected_)

86 // proxy_->OnOriginalURLLoaded();	86 // proxy_->OnOriginalURLLoaded();

87 }	87 }

88	88

89 } // namespace chromeos	89 } // namespace chromeos

OLD	NEW