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/intranet_redirect_detector.h" | 5 #include "chrome/browser/intranet_redirect_detector.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/rand_util.h" | 9 #include "base/rand_util.h" |
10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
11 #include "base/utf_string_conversions.h" | 11 #include "base/utf_string_conversions.h" |
12 #include "chrome/browser/browser_process.h" | 12 #include "chrome/browser/browser_process.h" |
| 13 #include "chrome/browser/prefs/pref_registry_simple.h" |
13 #include "chrome/browser/prefs/pref_service.h" | 14 #include "chrome/browser/prefs/pref_service.h" |
14 #include "chrome/common/chrome_switches.h" | 15 #include "chrome/common/chrome_switches.h" |
15 #include "chrome/common/pref_names.h" | 16 #include "chrome/common/pref_names.h" |
16 #include "net/base/load_flags.h" | 17 #include "net/base/load_flags.h" |
17 #include "net/base/net_errors.h" | 18 #include "net/base/net_errors.h" |
18 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" | 19 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" |
19 #include "net/url_request/url_fetcher.h" | 20 #include "net/url_request/url_fetcher.h" |
20 #include "net/url_request/url_request_context_getter.h" | 21 #include "net/url_request/url_request_context_getter.h" |
21 #include "net/url_request/url_request_status.h" | 22 #include "net/url_request/url_request_status.h" |
22 | 23 |
(...skipping 25 matching lines...) Expand all Loading... |
48 } | 49 } |
49 | 50 |
50 // static | 51 // static |
51 GURL IntranetRedirectDetector::RedirectOrigin() { | 52 GURL IntranetRedirectDetector::RedirectOrigin() { |
52 const IntranetRedirectDetector* const detector = | 53 const IntranetRedirectDetector* const detector = |
53 g_browser_process->intranet_redirect_detector(); | 54 g_browser_process->intranet_redirect_detector(); |
54 return detector ? detector->redirect_origin_ : GURL(); | 55 return detector ? detector->redirect_origin_ : GURL(); |
55 } | 56 } |
56 | 57 |
57 // static | 58 // static |
58 void IntranetRedirectDetector::RegisterPrefs(PrefServiceSimple* prefs) { | 59 void IntranetRedirectDetector::RegisterPrefs(PrefRegistrySimple* prefs) { |
59 prefs->RegisterStringPref(prefs::kLastKnownIntranetRedirectOrigin, | 60 prefs |
| 61 ->RegisterStringPref(prefs::kLastKnownIntranetRedirectOrigin, |
60 std::string()); | 62 std::string()); |
61 } | 63 } |
62 | 64 |
63 void IntranetRedirectDetector::FinishSleep() { | 65 void IntranetRedirectDetector::FinishSleep() { |
64 in_sleep_ = false; | 66 in_sleep_ = false; |
65 | 67 |
66 // If another fetch operation is still running, cancel it. | 68 // If another fetch operation is still running, cancel it. |
67 STLDeleteElements(&fetchers_); | 69 STLDeleteElements(&fetchers_); |
68 resulting_origins_.clear(); | 70 resulting_origins_.clear(); |
69 | 71 |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
173 // the same thread. So just use the heuristic that any all-lowercase a-z | 175 // the same thread. So just use the heuristic that any all-lowercase a-z |
174 // hostname with the right number of characters is likely from the detector | 176 // hostname with the right number of characters is likely from the detector |
175 // (and thus should be blocked). | 177 // (and thus should be blocked). |
176 return ((host.length() == IntranetRedirectDetector::kNumCharsInHostnames) && | 178 return ((host.length() == IntranetRedirectDetector::kNumCharsInHostnames) && |
177 (host.find_first_not_of("abcdefghijklmnopqrstuvwxyz") == | 179 (host.find_first_not_of("abcdefghijklmnopqrstuvwxyz") == |
178 std::string::npos)) ? | 180 std::string::npos)) ? |
179 net::ERR_NAME_NOT_RESOLVED : | 181 net::ERR_NAME_NOT_RESOLVED : |
180 ResolveUsingPrevious(host, address_family, host_resolver_flags, addrlist, | 182 ResolveUsingPrevious(host, address_family, host_resolver_flags, addrlist, |
181 os_error); | 183 os_error); |
182 } | 184 } |
OLD | NEW |