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

Unified Diff: chrome/browser/io_thread.h

Issue 1347043002: Move ChromeNetLog to //components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: DetachFromThread Created 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/io_thread.h
diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
index df0275de4dd0a03ccef2d046558d1c71dc9f0de9..d4c69d4901ea4563eea2f80d7d37cedbf9d1d1e9 100644
--- a/chrome/browser/io_thread.h
+++ b/chrome/browser/io_thread.h
@@ -26,7 +26,6 @@
#include "net/http/http_network_session.h"
#include "net/socket/next_proto.h"
-class ChromeNetLog;
class PrefProxyConfigTracker;
class PrefService;
class PrefRegistrySimple;
@@ -70,6 +69,10 @@ class URLRequestJobFactory;
class URLSecurityManager;
} // namespace net
+namespace net_log {
+class ChromeNetLog;
+}
+
namespace policy {
class PolicyService;
} // namespace policy
@@ -209,7 +212,7 @@ class IOThread : public content::BrowserThreadDelegate {
// |net_log| must either outlive the IOThread or be NULL.
IOThread(PrefService* local_state,
policy::PolicyService* policy_service,
- ChromeNetLog* net_log,
+ net_log::ChromeNetLog* net_log,
extensions::EventRouterForwarder* extension_event_router_forwarder);
~IOThread() override;
@@ -224,7 +227,7 @@ class IOThread : public content::BrowserThreadDelegate {
// IOThread global objects.
void SetGlobalsForTesting(Globals* globals);
- ChromeNetLog* net_log();
+ net_log::ChromeNetLog* net_log();
// Handles changing to On The Record mode, discarding confidential data.
void ChangedToOnTheRecord();
@@ -442,7 +445,7 @@ class IOThread : public content::BrowserThreadDelegate {
// The NetLog is owned by the browser process, to allow logging from other
// threads during shutdown, but is used most frequently on the IOThread.
- ChromeNetLog* net_log_;
+ net_log::ChromeNetLog* net_log_;
#if defined(ENABLE_EXTENSIONS)
// The extensions::EventRouterForwarder allows for sending events to

Powered by Google App Engine
This is Rietveld 408576698