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

Unified Diff: chrome/browser/net/net_error_tab_helper.cc

Issue 1277213003: Move DNS functions from net_error_info.h into error_page namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 5 years, 4 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
« no previous file with comments | « chrome/browser/net/dns_probe_service.cc ('k') | chrome/common/localized_error.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/net/net_error_tab_helper.cc
diff --git a/chrome/browser/net/net_error_tab_helper.cc b/chrome/browser/net/net_error_tab_helper.cc
index 02744df7c73585f6964c6bab8b39cb8a162c2f0d..83ecc117df72ab130e7bccf97fb2771ffd240d79 100644
--- a/chrome/browser/net/net_error_tab_helper.cc
+++ b/chrome/browser/net/net_error_tab_helper.cc
@@ -24,13 +24,13 @@
#include "url/gurl.h"
using chrome_common_net::DnsProbeStatus;
-using chrome_common_net::DnsProbeStatusToString;
using content::BrowserContext;
using content::BrowserThread;
-using ui::PageTransition;
using content::RenderViewHost;
using content::WebContents;
using content::WebContentsObserver;
+using error_page::DnsProbeStatusToString;
+using ui::PageTransition;
DEFINE_WEB_CONTENTS_USER_DATA_KEY(chrome_browser_net::NetErrorTabHelper);
@@ -101,7 +101,7 @@ void NetErrorTabHelper::DidStartNavigationToPendingEntry(
// Only record reloads.
if (reload_type != content::NavigationController::NO_RELOAD) {
- chrome_common_net::RecordEvent(
+ error_page::RecordEvent(
chrome_common_net::NETWORK_ERROR_PAGE_BROWSER_INITIATED_RELOAD);
}
}
@@ -217,7 +217,7 @@ void NetErrorTabHelper::StartDnsProbe() {
void NetErrorTabHelper::OnDnsProbeFinished(DnsProbeStatus result) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK_EQ(chrome_common_net::DNS_PROBE_STARTED, dns_probe_status_);
- DCHECK(chrome_common_net::DnsProbeStatusIsFinished(result));
+ DCHECK(error_page::DnsProbeStatusIsFinished(result));
DVLOG(1) << "Finished DNS probe with result "
<< DnsProbeStatusToString(result) << ".";
« no previous file with comments | « chrome/browser/net/dns_probe_service.cc ('k') | chrome/common/localized_error.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698