diff options
| author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-11 09:36:59 +0000 |
|---|---|---|
| committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-11 09:36:59 +0000 |
| commit | 386c889899593445683c2013ba3894f310995a91 (patch) | |
| tree | 5e547155af2ccdb0d68463e3e96b32719b9aea67 | |
| parent | 58499794f61c470e89dac754b085e3e0403d2cda (diff) | |
| download | chromium_src-386c889899593445683c2013ba3894f310995a91.zip chromium_src-386c889899593445683c2013ba3894f310995a91.tar.gz chromium_src-386c889899593445683c2013ba3894f310995a91.tar.bz2 | |
DevTools: Keep Resources panel enabled status upon frame navigate.
Review URL: http://codereview.chromium.org/118508
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18153 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/debugger/devtools_sanity_unittest.cc | 1 | ||||
| -rw-r--r-- | webkit/glue/webdevtoolsagent_impl.cc | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc index 270665e..71b4ab5 100644 --- a/chrome/browser/debugger/devtools_sanity_unittest.cc +++ b/chrome/browser/debugger/devtools_sanity_unittest.cc @@ -3,7 +3,6 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "chrome/browser/automation/ui_controls.h" #include "chrome/browser/browser.h" #include "chrome/browser/debugger/devtools_client_host.h" #include "chrome/browser/debugger/devtools_manager.h" diff --git a/webkit/glue/webdevtoolsagent_impl.cc b/webkit/glue/webdevtoolsagent_impl.cc index 592db96..f617220 100644 --- a/webkit/glue/webdevtoolsagent_impl.cc +++ b/webkit/glue/webdevtoolsagent_impl.cc @@ -151,6 +151,10 @@ void WebDevToolsAgentImpl::DidCommitLoadForFrame( tools_agent_delegate_stub_->FrameNavigate( url.possibly_invalid_spec(), webview->GetMainFrame() == frame); + InspectorController* ic = webview->page()->inspectorController(); + // Unhide resources panel if necessary. + tools_agent_delegate_stub_->SetResourcesPanelEnabled( + ic->resourceTrackingEnabled()); } void WebDevToolsAgentImpl::WindowObjectCleared(WebFrameImpl* webframe) { |