9 files changed, 15 insertions, 25 deletions
diff --git a/chrome/browser/debugger/devtools_client_host.h b/chrome/browser/debugger/devtools_client_host.h
index 7e1d67d..c6a50cb 100644
--- a/chrome/browser/debugger/devtools_client_host.h
+++ b/chrome/browser/debugger/devtools_client_host.h
@@ -35,10 +35,6 @@ class DevToolsClientHost {
   // closing.
   virtual void InspectedTabClosing() = 0;
 
-  // This method is called when tab inspected by this devtools client has
-  // navigated to some url.
-  virtual void SetInspectedTabUrl(const std::string& url) = 0;
-
   // Sends the message to the devtools client hosted by this object.
   virtual void SendMessageToClient(const IPC::Message& msg) = 0;
 
diff --git a/chrome/browser/debugger/devtools_manager.cc b/chrome/browser/debugger/devtools_manager.cc
index 9c8e7bc..582cc90 100644
--- a/chrome/browser/debugger/devtools_manager.cc
+++ b/chrome/browser/debugger/devtools_manager.cc
@@ -91,8 +91,6 @@ void DevToolsManager::OpenDevToolsWindow(RenderViewHost* inspected_rvh) {
         inspected_rvh->site_instance()->browsing_instance()->profile());
     RegisterDevToolsClientHostFor(inspected_rvh, host);
   }
-  host->SetInspectedTabUrl(
-      inspected_rvh->delegate()->GetURL().possibly_invalid_spec());
   DevToolsWindow* window = host->AsDevToolsWindow();
   if (window)
     window->Show();
@@ -145,7 +143,6 @@ void DevToolsManager::OnNavigatingToPendingEntry(RenderViewHost* inspected_rvh,
   DevToolsClientHost* client_host =
       GetDevToolsClientHostFor(inspected_rvh);
   if (client_host) {
-    client_host->SetInspectedTabUrl(gurl.possibly_invalid_spec());
     inspected_rvh_to_client_host_.erase(inspected_rvh);
     inspected_rvh_to_client_host_[dest_rvh] = client_host;
     client_host_to_inspected_rvh_[client_host] = dest_rvh;
diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc
index 44edd87..7ac6c05 100644
--- a/chrome/browser/debugger/devtools_window.cc
+++ b/chrome/browser/debugger/devtools_window.cc
@@ -60,11 +60,6 @@ void DevToolsWindow::InspectedTabClosing() {
   browser_->CloseAllTabs();
 }
 
-void DevToolsWindow::SetInspectedTabUrl(const std::string& url) {
-  inspected_url_ = url;
-  //TODO(pfeldman): Restore this.
-}
-
 void DevToolsWindow::SendMessageToClient(const IPC::Message& message) {
   RenderViewHost* target_host = tab_contents_->render_view_host();
   IPC::Message* m =  new IPC::Message(message);
diff --git a/chrome/browser/debugger/devtools_window.h b/chrome/browser/debugger/devtools_window.h
index e7be7c5..99d4e36 100644
--- a/chrome/browser/debugger/devtools_window.h
+++ b/chrome/browser/debugger/devtools_window.h
@@ -36,7 +36,6 @@ class DevToolsWindow : public DevToolsClientHost,
   // DevToolsClientHost override.
   virtual DevToolsWindow* AsDevToolsWindow();
   virtual void InspectedTabClosing();
-  virtual void SetInspectedTabUrl(const std::string& url);
   virtual void SendMessageToClient(const IPC::Message& message);
 
   // TabStripModelObserver implementation
diff --git a/chrome/browser/debugger/inspectable_tab_proxy.cc b/chrome/browser/debugger/inspectable_tab_proxy.cc
index 13bff6d..097b817 100644
--- a/chrome/browser/debugger/inspectable_tab_proxy.cc
+++ b/chrome/browser/debugger/inspectable_tab_proxy.cc
@@ -23,10 +23,6 @@ void DevToolsClientHostImpl::InspectedTabClosing() {
   delete this;
 }
 
-void DevToolsClientHostImpl::SetInspectedTabUrl(const std::string& url) {
-  // TODO(apavlov): Notify debugger on the url update if necessary.
-}
-
 void DevToolsClientHostImpl::SendMessageToClient(
     const IPC::Message& msg) {
   IPC_BEGIN_MESSAGE_MAP(DevToolsClientHostImpl, msg)
diff --git a/chrome/browser/debugger/inspectable_tab_proxy.h b/chrome/browser/debugger/inspectable_tab_proxy.h
index 0361c2d..104b957 100644
--- a/chrome/browser/debugger/inspectable_tab_proxy.h
+++ b/chrome/browser/debugger/inspectable_tab_proxy.h
@@ -72,7 +72,6 @@ class DevToolsClientHostImpl : public DevToolsClientHost {
 
   // DevToolsClientHost interface
   virtual void InspectedTabClosing();
-  virtual void SetInspectedTabUrl(const std::string& url);
   virtual void SendMessageToClient(const IPC::Message& msg);
 
  private:
diff --git a/webkit/glue/devtools/js/net_agent.js b/webkit/glue/devtools/js/net_agent.js
index bf4cd68..957e119 100644
--- a/webkit/glue/devtools/js/net_agent.js
+++ b/webkit/glue/devtools/js/net_agent.js
@@ -120,4 +120,7 @@ devtools.NetAgent.prototype.didFinishLoading = function(identifier, value) {
   resource.endTime = value.endTime;
   resource.finished = true;
   resource.failed = !!value.errorCode;
+  if (resource.mainResource) {
+    document.title = 'Developer Tools - ' + resource.url;
+  }
 };
diff --git a/webkit/glue/devtools/net_agent_impl.cc b/webkit/glue/devtools/net_agent_impl.cc
index ab3d60b..e1c0e84 100644
--- a/webkit/glue/devtools/net_agent_impl.cc
+++ b/webkit/glue/devtools/net_agent_impl.cc
@@ -140,16 +140,17 @@ void NetAgentImpl::DidFinishLoading(
     return;
   }
 
+  Resource* resource = pending_resources_.get(identifier);
+  resource->end_time = WTF::currentTime();
+
   // This is the first command being dispatched after
   // DidCommitMainResourceLoad, we know that the first resource to be reported
   // as loaded is main resource.
   if (!main_loader_.get()) {
     main_loader_ = loader;
+    resource->main_resource = true;
   }
 
-  Resource* resource = pending_resources_.get(identifier);
-  resource->end_time = WTF::currentTime();
-
   pending_resources_.remove(identifier);
   finished_resources_.append(std::make_pair(identifier, resource));
 
@@ -303,7 +304,7 @@ void NetAgentImpl::Serialize(const Resource& resource,
   value->Set(L"responseHeaders",
              BuildValueForHeaders(resource.response_headers));
 
-  value->SetBoolean(L"isMainResource", false);
+  value->SetBoolean(L"isMainResource", resource.main_resource);
   value->SetBoolean(L"cached", false);
 
   if (resource.error_code) {
@@ -315,9 +316,10 @@ void NetAgentImpl::Serialize(const Resource& resource,
 
 void NetAgentImpl::ExpireFinishedResourcesCache() {
   if (finished_resources_.size() > 100) {
-    for (int i = 0; i < 20; ++i) {
+    // Preserve main resource.
+    for (int i = 1; i < 21; ++i) {
       delete finished_resources_[i].second;
     }
-    finished_resources_.remove(0, 20);
+    finished_resources_.remove(1, 21);
   }
 }
diff --git a/webkit/glue/devtools/net_agent_impl.h b/webkit/glue/devtools/net_agent_impl.h
index a197ac3..a308167 100644
--- a/webkit/glue/devtools/net_agent_impl.h
+++ b/webkit/glue/devtools/net_agent_impl.h
@@ -88,13 +88,16 @@ class NetAgentImpl : public NetAgent {
  private:
   struct Resource {
     Resource()
-        : start_time(0),
+        : main_resource(false),
+          start_time(0),
           response_received_time(0),
           end_time(0),
           expected_content_length(0),
           http_status_code(0),
           error_code(0) {
     }
+    bool main_resource;
+
     double start_time;
     double response_received_time;
     double end_time;