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/chrome_content_browser_client.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/chrome_content_browser_client.cc')
| -rw-r--r-- | chrome/browser/chrome_content_browser_client.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 7ea7bbc..c77cd39 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -21,7 +21,6 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_web_ui.h" #include "chrome/browser/google/google_util.h" -#include "chrome/browser/net/chrome_net_log.h" #include "chrome/browser/notifications/desktop_notification_service.h" #include "chrome/browser/notifications/desktop_notification_service_factory.h" #include "chrome/browser/platform_util.h" @@ -690,10 +689,6 @@ DevToolsManager* ChromeContentBrowserClient::GetDevToolsManager() { return g_browser_process->devtools_manager(); } -net::NetLog* ChromeContentBrowserClient::GetNetLog() { - return g_browser_process->net_log(); -} - bool ChromeContentBrowserClient::IsFastShutdownPossible() { const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); return !browser_command_line.HasSwitch(switches::kChromeFrame); |