diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-26 23:58:46 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-26 23:58:46 +0000 |
| commit | 30ac64979c2a74a665ef40101afd5fd4f3c5f0c2 (patch) | |
| tree | 3999015c27882c3e03db9de6b8effffd1ddae849 /chrome/browser/net/load_timing_observer.cc | |
| parent | 7e8e701d344b4692977fc09c3b1ec4c6725d6fae (diff) | |
| download | chromium_src-30ac64979c2a74a665ef40101afd5fd4f3c5f0c2.zip chromium_src-30ac64979c2a74a665ef40101afd5fd4f3c5f0c2.tar.gz chromium_src-30ac64979c2a74a665ef40101afd5fd4f3c5f0c2.tar.bz2 | |
Revert 94196 (broke win shared build) - Remove ChromeNetLog dependency from content/browser/debugger.
Add Observer concept to net::NetLog.
Use net::NetLog::Observer in ChromeNetLog.
Remove ChromeNetLog dependency in content/browser/debugger.
Forked from http://codereview.chromium.org/7310029/ to finish Jói's
patch.
BUG=84078
TEST=existing
Review URL: http://codereview.chromium.org/7468019
TBR=dpranke@chromium.org
Review URL: http://codereview.chromium.org/7517004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94208 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net/load_timing_observer.cc')
| -rw-r--r-- | chrome/browser/net/load_timing_observer.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/net/load_timing_observer.cc b/chrome/browser/net/load_timing_observer.cc index 788394f..e891075 100644 --- a/chrome/browser/net/load_timing_observer.cc +++ b/chrome/browser/net/load_timing_observer.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -62,7 +62,7 @@ LoadTimingObserver::HTTPStreamJobRecord::HTTPStreamJobRecord() } LoadTimingObserver::LoadTimingObserver() - : ThreadSafeObserverImpl(net::NetLog::LOG_BASIC), + : ThreadSafeObserver(net::NetLog::LOG_BASIC), last_connect_job_id_(net::NetLog::Source::kInvalidId) { } |