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

Side by Side Diff: chrome/browser/net/net_error_tab_helper.cc

Issue 2028383002: Revert of Record offline histograms with suffix via Histogram::FactoryGet (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
OLDNEW
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/net/net_error_tab_helper.h" 5 #include "chrome/browser/net/net_error_tab_helper.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/io_thread.h" 10 #include "chrome/browser/io_thread.h"
(...skipping 10 matching lines...) Expand all
21 #include "content/public/browser/navigation_entry.h" 21 #include "content/public/browser/navigation_entry.h"
22 #include "content/public/browser/navigation_handle.h" 22 #include "content/public/browser/navigation_handle.h"
23 #include "content/public/browser/render_frame_host.h" 23 #include "content/public/browser/render_frame_host.h"
24 #include "ipc/ipc_message_macros.h" 24 #include "ipc/ipc_message_macros.h"
25 #include "net/base/net_errors.h" 25 #include "net/base/net_errors.h"
26 #include "url/gurl.h" 26 #include "url/gurl.h"
27 27
28 #if BUILDFLAG(ANDROID_JAVA_UI) 28 #if BUILDFLAG(ANDROID_JAVA_UI)
29 #include "chrome/browser/android/offline_pages/offline_page_model_factory.h" 29 #include "chrome/browser/android/offline_pages/offline_page_model_factory.h"
30 #include "chrome/browser/android/tab_android.h" 30 #include "chrome/browser/android/tab_android.h"
31 #include "components/offline_pages/client_namespace_constants.h"
32 #include "components/offline_pages/offline_page_feature.h" 31 #include "components/offline_pages/offline_page_feature.h"
33 #include "components/offline_pages/offline_page_item.h" 32 #include "components/offline_pages/offline_page_item.h"
34 #include "components/offline_pages/offline_page_model.h" 33 #include "components/offline_pages/offline_page_model.h"
35 #endif // BUILDFLAG(ANDROID_JAVA_UI) 34 #endif // BUILDFLAG(ANDROID_JAVA_UI)
36 35
37 using content::BrowserContext; 36 using content::BrowserContext;
38 using content::BrowserThread; 37 using content::BrowserThread;
39 using content::WebContents; 38 using content::WebContents;
40 using content::WebContentsObserver; 39 using content::WebContentsObserver;
41 using error_page::DnsProbeStatus; 40 using error_page::DnsProbeStatus;
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 338
340 bool NetErrorTabHelper::IsFromErrorPage() const { 339 bool NetErrorTabHelper::IsFromErrorPage() const {
341 content::NavigationEntry* entry = 340 content::NavigationEntry* entry =
342 web_contents()->GetController().GetLastCommittedEntry(); 341 web_contents()->GetController().GetLastCommittedEntry();
343 return entry && (entry->GetPageType() == content::PAGE_TYPE_ERROR); 342 return entry && (entry->GetPageType() == content::PAGE_TYPE_ERROR);
344 } 343 }
345 344
346 #endif // BUILDFLAG(ANDROID_JAVA_UI) 345 #endif // BUILDFLAG(ANDROID_JAVA_UI)
347 346
348 } // namespace chrome_browser_net 347 } // namespace chrome_browser_net
OLDNEW
« no previous file with comments | « chrome/browser/android/offline_pages/offline_page_utils_unittest.cc ('k') | components/offline_pages.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698