diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-26 23:09:27 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-26 23:09:27 +0000 |
| commit | e07dc0e46f2904120798341acc3225cf396f2ec4 (patch) | |
| tree | 914702949651664c1df1b0ef958e5fad3dd3aebc /content/browser/debugger/devtools_netlog_observer.cc | |
| parent | caf41afeb2542ce803f3faa61287f3681b78837a (diff) | |
| download | chromium_src-e07dc0e46f2904120798341acc3225cf396f2ec4.zip chromium_src-e07dc0e46f2904120798341acc3225cf396f2ec4.tar.gz chromium_src-e07dc0e46f2904120798341acc3225cf396f2ec4.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94196 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/debugger/devtools_netlog_observer.cc')
| -rw-r--r-- | content/browser/debugger/devtools_netlog_observer.cc | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/content/browser/debugger/devtools_netlog_observer.cc b/content/browser/debugger/devtools_netlog_observer.cc index 919c53c..9e278b0 100644 --- a/content/browser/debugger/devtools_netlog_observer.cc +++ b/content/browser/debugger/devtools_netlog_observer.cc @@ -7,7 +7,8 @@ #include "base/string_tokenizer.h" #include "base/string_util.h" #include "base/values.h" -#include "chrome/browser/io_thread.h" +#include "content/browser/browser_thread.h" +#include "content/browser/content_browser_client.h" #include "content/common/resource_response.h" #include "net/base/load_flags.h" #include "net/http/http_net_log_params.h" @@ -21,14 +22,14 @@ const size_t kMaxNumEntries = 1000; DevToolsNetLogObserver* DevToolsNetLogObserver::instance_ = NULL; -DevToolsNetLogObserver::DevToolsNetLogObserver(ChromeNetLog* chrome_net_log) - : ChromeNetLog::ThreadSafeObserver(net::NetLog::LOG_ALL_BUT_BYTES), - chrome_net_log_(chrome_net_log) { - chrome_net_log_->AddObserver(this); +DevToolsNetLogObserver::DevToolsNetLogObserver(net::NetLog* net_log) + : net::NetLog::ThreadSafeObserver(net::NetLog::LOG_ALL_BUT_BYTES), + net_log_(net_log) { + net_log_->AddThreadSafeObserver(this); } DevToolsNetLogObserver::~DevToolsNetLogObserver() { - chrome_net_log_->RemoveObserver(this); + net_log_->RemoveThreadSafeObserver(this); } DevToolsNetLogObserver::ResourceInfo* @@ -235,11 +236,11 @@ void DevToolsNetLogObserver::OnAddSocketEntry( } } -void DevToolsNetLogObserver::Attach(IOThread* io_thread) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); +void DevToolsNetLogObserver::Attach() { DCHECK(!instance_); - instance_ = new DevToolsNetLogObserver(io_thread->net_log()); + instance_ = new DevToolsNetLogObserver( + content::GetContentClient()->browser()->GetNetLog()); } void DevToolsNetLogObserver::Detach() { |