| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/devtools/devtools_http_handler_impl.h" | 5 #include "content/browser/devtools/devtools_http_handler_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| 11 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
| 12 #include "base/file_util.h" | 12 #include "base/file_util.h" |
| 13 #include "base/json/json_writer.h" | 13 #include "base/json/json_writer.h" |
| 14 #include "base/lazy_instance.h" | 14 #include "base/lazy_instance.h" |
| 15 #include "base/logging.h" | 15 #include "base/logging.h" |
| 16 #include "base/message_loop_proxy.h" | 16 #include "base/message_loop_proxy.h" |
| 17 #include "base/string_number_conversions.h" | 17 #include "base/string_number_conversions.h" |
| 18 #include "base/stringprintf.h" | |
| 19 #include "base/threading/thread.h" | 18 #include "base/threading/thread.h" |
| 20 #include "base/utf_string_conversions.h" | 19 #include "base/utf_string_conversions.h" |
| 21 #include "base/values.h" | 20 #include "base/values.h" |
| 22 #include "content/browser/devtools/devtools_agent_host_impl.h" | |
| 23 #include "content/browser/devtools/devtools_browser_target.h" | 21 #include "content/browser/devtools/devtools_browser_target.h" |
| 24 #include "content/browser/devtools/devtools_tracing_handler.h" | 22 #include "content/browser/devtools/devtools_tracing_handler.h" |
| 25 #include "content/browser/web_contents/web_contents_impl.h" | 23 #include "content/browser/web_contents/web_contents_impl.h" |
| 26 #include "content/common/devtools_messages.h" | 24 #include "content/common/devtools_messages.h" |
| 27 #include "content/public/browser/browser_thread.h" | 25 #include "content/public/browser/browser_thread.h" |
| 28 #include "content/public/browser/devtools_agent_host.h" | 26 #include "content/public/browser/devtools_agent_host.h" |
| 29 #include "content/public/browser/devtools_client_host.h" | 27 #include "content/public/browser/devtools_client_host.h" |
| 30 #include "content/public/browser/devtools_http_handler_delegate.h" | 28 #include "content/public/browser/devtools_http_handler_delegate.h" |
| 31 #include "content/public/browser/devtools_manager.h" | 29 #include "content/public/browser/devtools_manager.h" |
| 32 #include "content/public/browser/favicon_status.h" | 30 #include "content/public/browser/favicon_status.h" |
| 33 #include "content/public/browser/navigation_entry.h" | 31 #include "content/public/browser/navigation_entry.h" |
| 34 #include "content/public/browser/notification_service.h" | 32 #include "content/public/browser/notification_service.h" |
| 35 #include "content/public/browser/notification_types.h" | 33 #include "content/public/browser/notification_types.h" |
| 36 #include "content/public/browser/render_process_host.h" | |
| 37 #include "content/public/browser/render_view_host.h" | 34 #include "content/public/browser/render_view_host.h" |
| 38 #include "content/public/browser/render_widget_host.h" | |
| 39 #include "content/public/common/content_client.h" | 35 #include "content/public/common/content_client.h" |
| 40 #include "content/public/common/url_constants.h" | 36 #include "content/public/common/url_constants.h" |
| 41 #include "googleurl/src/gurl.h" | 37 #include "googleurl/src/gurl.h" |
| 42 #include "grit/devtools_resources_map.h" | 38 #include "grit/devtools_resources_map.h" |
| 43 #include "net/base/escape.h" | 39 #include "net/base/escape.h" |
| 44 #include "net/base/io_buffer.h" | 40 #include "net/base/io_buffer.h" |
| 45 #include "net/base/ip_endpoint.h" | 41 #include "net/base/ip_endpoint.h" |
| 46 #include "net/server/http_server_request_info.h" | 42 #include "net/server/http_server_request_info.h" |
| 47 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" | 43 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" |
| 48 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h" | 44 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h" |
| 49 #include "ui/base/layout.h" | 45 #include "ui/base/layout.h" |
| 50 #include "webkit/user_agent/user_agent.h" | 46 #include "webkit/user_agent/user_agent.h" |
| 51 #include "webkit/user_agent/user_agent_util.h" | 47 #include "webkit/user_agent/user_agent_util.h" |
| 52 | 48 |
| 53 namespace content { | 49 namespace content { |
| 54 | 50 |
| 55 const int kBufferSize = 16 * 1024; | 51 const int kBufferSize = 16 * 1024; |
| 56 | 52 |
| 57 namespace { | 53 namespace { |
| 58 | 54 |
| 59 static const char* kDevToolsHandlerThreadName = "Chrome_DevToolsHandlerThread"; | 55 static const char* kDevToolsHandlerThreadName = "Chrome_DevToolsHandlerThread"; |
| 60 | 56 |
| 57 static const char* kThumbUrlPrefix = "/thumb/"; |
| 58 |
| 61 class DevToolsDefaultBindingHandler | 59 class DevToolsDefaultBindingHandler |
| 62 : public DevToolsHttpHandler::DevToolsAgentHostBinding { | 60 : public DevToolsHttpHandler::DevToolsAgentHostBinding { |
| 63 public: | 61 public: |
| 64 DevToolsDefaultBindingHandler() { | 62 DevToolsDefaultBindingHandler() { |
| 65 } | 63 } |
| 66 | 64 |
| 67 void GarbageCollect() { | 65 void GarbageCollect() { |
| 68 AgentsMap::iterator it = agents_map_.begin(); | 66 AgentsMap::iterator it = agents_map_.begin(); |
| 69 while (it != agents_map_.end()) { | 67 while (it != agents_map_.end()) { |
| 70 if (!it->second->GetRenderViewHost()) | 68 if (!it->second->GetRenderViewHost()) |
| 71 agents_map_.erase(it++); | 69 agents_map_.erase(it++); |
| 72 else | 70 else |
| 73 ++it; | 71 ++it; |
| 74 } | 72 } |
| 75 } | 73 } |
| 76 | 74 |
| 77 virtual std::string GetIdentifier(DevToolsAgentHost* agent_host) OVERRIDE { | 75 virtual std::string GetIdentifier(DevToolsAgentHost* agent_host) OVERRIDE { |
| 78 GarbageCollect(); | 76 GarbageCollect(); |
| 79 DevToolsAgentHostImpl* agent_host_impl = | 77 std::string id = agent_host->GetId(); |
| 80 static_cast<DevToolsAgentHostImpl*>(agent_host); | |
| 81 std::string id = base::StringPrintf("%d", agent_host_impl->id()); | |
| 82 agents_map_[id] = agent_host; | 78 agents_map_[id] = agent_host; |
| 83 return id; | 79 return id; |
| 84 } | 80 } |
| 85 | 81 |
| 86 virtual DevToolsAgentHost* ForIdentifier( | 82 virtual DevToolsAgentHost* ForIdentifier( |
| 87 const std::string& identifier) OVERRIDE { | 83 const std::string& identifier) OVERRIDE { |
| 88 GarbageCollect(); | 84 GarbageCollect(); |
| 89 AgentsMap::iterator it = agents_map_.find(identifier); | 85 AgentsMap::iterator it = agents_map_.find(identifier); |
| 90 if (it != agents_map_.end()) | 86 if (it != agents_map_.end()) |
| 91 return it->second; | 87 return it->second; |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 } | 145 } |
| 150 | 146 |
| 151 private: | 147 private: |
| 152 MessageLoop* message_loop_; | 148 MessageLoop* message_loop_; |
| 153 net::HttpServer* server_; | 149 net::HttpServer* server_; |
| 154 int connection_id_; | 150 int connection_id_; |
| 155 bool is_closed_; | 151 bool is_closed_; |
| 156 std::string detach_reason_; | 152 std::string detach_reason_; |
| 157 }; | 153 }; |
| 158 | 154 |
| 155 static base::TimeTicks GetLastSelectedTime(RenderViewHost* rvh) { |
| 156 WebContents* web_contents = rvh->GetDelegate()->GetAsWebContents(); |
| 157 if (!web_contents) |
| 158 return base::TimeTicks(); |
| 159 |
| 160 return web_contents->GetLastSelectedTime(); |
| 161 } |
| 162 |
| 163 typedef std::pair<RenderViewHost*, base::TimeTicks> PageInfo; |
| 164 |
| 165 static bool TimeComparator(const PageInfo& info1, const PageInfo& info2) { |
| 166 return info1.second > info2.second; |
| 167 } |
| 168 |
| 159 } // namespace | 169 } // namespace |
| 160 | 170 |
| 161 // static | 171 // static |
| 162 int DevToolsHttpHandler::GetFrontendResourceId(const std::string& name) { | 172 int DevToolsHttpHandler::GetFrontendResourceId(const std::string& name) { |
| 163 for (size_t i = 0; i < kDevtoolsResourcesSize; ++i) { | 173 for (size_t i = 0; i < kDevtoolsResourcesSize; ++i) { |
| 164 if (name == kDevtoolsResources[i].name) | 174 if (name == kDevtoolsResources[i].name) |
| 165 return kDevtoolsResources[i].value; | 175 return kDevtoolsResources[i].value; |
| 166 } | 176 } |
| 167 return -1; | 177 return -1; |
| 168 } | 178 } |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 300 BrowserThread::PostTask( | 310 BrowserThread::PostTask( |
| 301 BrowserThread::UI, | 311 BrowserThread::UI, |
| 302 FROM_HERE, | 312 FROM_HERE, |
| 303 base::Bind(&DevToolsHttpHandlerImpl::OnJsonRequestUI, | 313 base::Bind(&DevToolsHttpHandlerImpl::OnJsonRequestUI, |
| 304 this, | 314 this, |
| 305 connection_id, | 315 connection_id, |
| 306 info)); | 316 info)); |
| 307 return; | 317 return; |
| 308 } | 318 } |
| 309 | 319 |
| 310 if (info.path.find("/thumb/") == 0) { | 320 if (info.path.find(kThumbUrlPrefix) == 0) { |
| 311 // Thumbnail request. | 321 // Thumbnail request. |
| 322 const std::string target_id = info.path.substr(strlen(kThumbUrlPrefix)); |
| 323 DevToolsAgentHost* agent_host = binding_->ForIdentifier(target_id); |
| 324 GURL page_url; |
| 325 if (agent_host) { |
| 326 RenderViewHost* rvh = agent_host->GetRenderViewHost(); |
| 327 if (rvh) |
| 328 page_url = rvh->GetDelegate()->GetURL(); |
| 329 } |
| 312 BrowserThread::PostTask( | 330 BrowserThread::PostTask( |
| 313 BrowserThread::UI, | 331 BrowserThread::UI, |
| 314 FROM_HERE, | 332 FROM_HERE, |
| 315 base::Bind(&DevToolsHttpHandlerImpl::OnThumbnailRequestUI, | 333 base::Bind(&DevToolsHttpHandlerImpl::OnThumbnailRequestUI, |
| 316 this, | 334 this, |
| 317 connection_id, | 335 connection_id, |
| 318 info)); | 336 page_url)); |
| 319 return; | 337 return; |
| 320 } | 338 } |
| 321 | 339 |
| 322 if (info.path == "" || info.path == "/") { | 340 if (info.path == "" || info.path == "/") { |
| 323 // Discovery page request. | 341 // Discovery page request. |
| 324 BrowserThread::PostTask( | 342 BrowserThread::PostTask( |
| 325 BrowserThread::UI, | 343 BrowserThread::UI, |
| 326 FROM_HERE, | 344 FROM_HERE, |
| 327 base::Bind(&DevToolsHttpHandlerImpl::OnDiscoveryPageRequestUI, | 345 base::Bind(&DevToolsHttpHandlerImpl::OnDiscoveryPageRequestUI, |
| 328 this, | 346 this, |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 387 void DevToolsHttpHandlerImpl::OnClose(int connection_id) { | 405 void DevToolsHttpHandlerImpl::OnClose(int connection_id) { |
| 388 BrowserThread::PostTask( | 406 BrowserThread::PostTask( |
| 389 BrowserThread::UI, | 407 BrowserThread::UI, |
| 390 FROM_HERE, | 408 FROM_HERE, |
| 391 base::Bind( | 409 base::Bind( |
| 392 &DevToolsHttpHandlerImpl::OnCloseUI, | 410 &DevToolsHttpHandlerImpl::OnCloseUI, |
| 393 this, | 411 this, |
| 394 connection_id)); | 412 connection_id)); |
| 395 } | 413 } |
| 396 | 414 |
| 397 struct DevToolsHttpHandlerImpl::PageInfo { | |
| 398 PageInfo() | |
| 399 : attached(false) { | |
| 400 } | |
| 401 | |
| 402 std::string id; | |
| 403 std::string url; | |
| 404 std::string type; | |
| 405 bool attached; | |
| 406 std::string title; | |
| 407 std::string thumbnail_url; | |
| 408 std::string favicon_url; | |
| 409 base::TimeTicks last_selected_time; | |
| 410 }; | |
| 411 | |
| 412 // static | |
| 413 bool DevToolsHttpHandlerImpl::SortPageListByTime(const PageInfo& info1, | |
| 414 const PageInfo& info2) { | |
| 415 return info1.last_selected_time > info2.last_selected_time; | |
| 416 } | |
| 417 | |
| 418 DevToolsHttpHandlerImpl::PageList DevToolsHttpHandlerImpl::GeneratePageList() { | |
| 419 PageList page_list; | |
| 420 for (RenderProcessHost::iterator it(RenderProcessHost::AllHostsIterator()); | |
| 421 !it.IsAtEnd(); it.Advance()) { | |
| 422 RenderProcessHost* render_process_host = it.GetCurrentValue(); | |
| 423 DCHECK(render_process_host); | |
| 424 | |
| 425 // Ignore processes that don't have a connection, such as crashed contents. | |
| 426 if (!render_process_host->HasConnection()) | |
| 427 continue; | |
| 428 | |
| 429 RenderProcessHost::RenderWidgetHostsIterator rwit( | |
| 430 render_process_host->GetRenderWidgetHostsIterator()); | |
| 431 for (; !rwit.IsAtEnd(); rwit.Advance()) { | |
| 432 const RenderWidgetHost* widget = rwit.GetCurrentValue(); | |
| 433 DCHECK(widget); | |
| 434 if (!widget || !widget->IsRenderView()) | |
| 435 continue; | |
| 436 | |
| 437 RenderViewHost* host = | |
| 438 RenderViewHost::From(const_cast<RenderWidgetHost*>(widget)); | |
| 439 page_list.push_back(CreatePageInfo(host, delegate_->GetTargetType(host))); | |
| 440 } | |
| 441 } | |
| 442 std::sort(page_list.begin(), page_list.end(), SortPageListByTime); | |
| 443 return page_list; | |
| 444 } | |
| 445 | |
| 446 std::string DevToolsHttpHandlerImpl::GetFrontendURLInternal( | 415 std::string DevToolsHttpHandlerImpl::GetFrontendURLInternal( |
| 447 const std::string rvh_id, | 416 const std::string rvh_id, |
| 448 const std::string& host) { | 417 const std::string& host) { |
| 449 return base::StringPrintf( | 418 return base::StringPrintf( |
| 450 "%s%sws=%s/devtools/page/%s", | 419 "%s%sws=%s/devtools/page/%s", |
| 451 overridden_frontend_url_.c_str(), | 420 overridden_frontend_url_.c_str(), |
| 452 overridden_frontend_url_.find("?") == std::string::npos ? "?" : "&", | 421 overridden_frontend_url_.find("?") == std::string::npos ? "?" : "&", |
| 453 host.c_str(), | 422 host.c_str(), |
| 454 rvh_id.c_str()); | 423 rvh_id.c_str()); |
| 455 } | 424 } |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 519 webkit_glue::GetWebKitVersion()); | 488 webkit_glue::GetWebKitVersion()); |
| 520 version.SetString("Browser", | 489 version.SetString("Browser", |
| 521 content::GetContentClient()->GetProduct()); | 490 content::GetContentClient()->GetProduct()); |
| 522 version.SetString("User-Agent", | 491 version.SetString("User-Agent", |
| 523 webkit_glue::GetUserAgent(GURL(chrome::kAboutBlankURL))); | 492 webkit_glue::GetUserAgent(GURL(chrome::kAboutBlankURL))); |
| 524 SendJson(connection_id, net::HTTP_OK, &version, "", jsonp); | 493 SendJson(connection_id, net::HTTP_OK, &version, "", jsonp); |
| 525 return; | 494 return; |
| 526 } | 495 } |
| 527 | 496 |
| 528 if (command == "list") { | 497 if (command == "list") { |
| 529 PageList page_list = GeneratePageList(); | 498 typedef std::vector<PageInfo> PageList; |
| 499 PageList page_list; |
| 500 |
| 501 std::vector<RenderViewHost*> rvh_list = |
| 502 DevToolsAgentHost::GetValidRenderViewHosts(); |
| 503 for (std::vector<RenderViewHost*>::iterator it = rvh_list.begin(); |
| 504 it != rvh_list.end(); ++it) |
| 505 page_list.push_back(PageInfo(*it, GetLastSelectedTime(*it))); |
| 506 |
| 507 std::sort(page_list.begin(), page_list.end(), TimeComparator); |
| 508 |
| 530 base::ListValue json_pages_list; | 509 base::ListValue json_pages_list; |
| 531 std::string host = info.headers["Host"]; | 510 std::string host = info.headers["Host"]; |
| 532 for (PageList::iterator i = page_list.begin(); i != page_list.end(); ++i) | 511 for (PageList::iterator i = page_list.begin(); i != page_list.end(); ++i) |
| 533 json_pages_list.Append(SerializePageInfo(*i, host)); | 512 json_pages_list.Append(SerializePageInfo(i->first, host)); |
| 534 SendJson(connection_id, net::HTTP_OK, &json_pages_list, "", jsonp); | 513 SendJson(connection_id, net::HTTP_OK, &json_pages_list, "", jsonp); |
| 535 return; | 514 return; |
| 536 } | 515 } |
| 537 | 516 |
| 538 if (command == "new") { | 517 if (command == "new") { |
| 539 RenderViewHost* rvh = delegate_->CreateNewTarget(); | 518 RenderViewHost* rvh = delegate_->CreateNewTarget(); |
| 540 if (!rvh) { | 519 if (!rvh) { |
| 541 SendJson(connection_id, | 520 SendJson(connection_id, |
| 542 net::HTTP_INTERNAL_SERVER_ERROR, | 521 net::HTTP_INTERNAL_SERVER_ERROR, |
| 543 NULL, | 522 NULL, |
| 544 "Could not create new page", | 523 "Could not create new page", |
| 545 jsonp); | 524 jsonp); |
| 546 return; | 525 return; |
| 547 } | 526 } |
| 548 PageInfo page_info = | |
| 549 CreatePageInfo(rvh, DevToolsHttpHandlerDelegate::kTargetTypeTab); | |
| 550 std::string host = info.headers["Host"]; | 527 std::string host = info.headers["Host"]; |
| 551 scoped_ptr<base::DictionaryValue> dictionary( | 528 scoped_ptr<base::DictionaryValue> dictionary(SerializePageInfo(rvh, host)); |
| 552 SerializePageInfo(page_info, host)); | |
| 553 SendJson(connection_id, net::HTTP_OK, dictionary.get(), "", jsonp); | 529 SendJson(connection_id, net::HTTP_OK, dictionary.get(), "", jsonp); |
| 554 return; | 530 return; |
| 555 } | 531 } |
| 556 | 532 |
| 557 if (command == "activate" || command == "close") { | 533 if (command == "activate" || command == "close") { |
| 558 DevToolsAgentHost* agent_host = binding_->ForIdentifier(target_id); | 534 DevToolsAgentHost* agent_host = binding_->ForIdentifier(target_id); |
| 559 RenderViewHost* rvh = agent_host ? agent_host->GetRenderViewHost() : NULL; | 535 RenderViewHost* rvh = agent_host ? agent_host->GetRenderViewHost() : NULL; |
| 560 if (!rvh) { | 536 if (!rvh) { |
| 561 SendJson(connection_id, | 537 SendJson(connection_id, |
| 562 net::HTTP_NOT_FOUND, | 538 net::HTTP_NOT_FOUND, |
| (...skipping 17 matching lines...) Expand all Loading... |
| 580 } | 556 } |
| 581 SendJson(connection_id, | 557 SendJson(connection_id, |
| 582 net::HTTP_NOT_FOUND, | 558 net::HTTP_NOT_FOUND, |
| 583 NULL, | 559 NULL, |
| 584 "Unknown command: " + command, | 560 "Unknown command: " + command, |
| 585 jsonp); | 561 jsonp); |
| 586 return; | 562 return; |
| 587 } | 563 } |
| 588 | 564 |
| 589 void DevToolsHttpHandlerImpl::OnThumbnailRequestUI( | 565 void DevToolsHttpHandlerImpl::OnThumbnailRequestUI( |
| 590 int connection_id, | 566 int connection_id, const GURL& page_url) { |
| 591 const net::HttpServerRequestInfo& info) { | 567 std::string data = delegate_->GetPageThumbnailData(page_url); |
| 592 std::string prefix = "/thumb/"; | |
| 593 size_t pos = info.path.find(prefix); | |
| 594 if (pos != 0) { | |
| 595 Send404(connection_id); | |
| 596 return; | |
| 597 } | |
| 598 | |
| 599 std::string page_url = info.path.substr(prefix.length()); | |
| 600 std::string data = delegate_->GetPageThumbnailData(GURL(page_url)); | |
| 601 if (!data.empty()) | 568 if (!data.empty()) |
| 602 Send200(connection_id, data, "image/png"); | 569 Send200(connection_id, data, "image/png"); |
| 603 else | 570 else |
| 604 Send404(connection_id); | 571 Send404(connection_id); |
| 605 } | 572 } |
| 606 | 573 |
| 607 void DevToolsHttpHandlerImpl::OnDiscoveryPageRequestUI(int connection_id) { | 574 void DevToolsHttpHandlerImpl::OnDiscoveryPageRequestUI(int connection_id) { |
| 608 std::string response = delegate_->GetDiscoveryPageHTML(); | 575 std::string response = delegate_->GetDiscoveryPageHTML(); |
| 609 Send200(connection_id, response, "text/html; charset=UTF-8"); | 576 Send200(connection_id, response, "text/html; charset=UTF-8"); |
| 610 } | 577 } |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 830 int connection_id, | 797 int connection_id, |
| 831 const net::HttpServerRequestInfo& request) { | 798 const net::HttpServerRequestInfo& request) { |
| 832 if (!thread_.get()) | 799 if (!thread_.get()) |
| 833 return; | 800 return; |
| 834 thread_->message_loop()->PostTask( | 801 thread_->message_loop()->PostTask( |
| 835 FROM_HERE, | 802 FROM_HERE, |
| 836 base::Bind(&net::HttpServer::AcceptWebSocket, server_.get(), | 803 base::Bind(&net::HttpServer::AcceptWebSocket, server_.get(), |
| 837 connection_id, request)); | 804 connection_id, request)); |
| 838 } | 805 } |
| 839 | 806 |
| 840 DevToolsHttpHandlerImpl::PageInfo | 807 base::DictionaryValue* DevToolsHttpHandlerImpl::SerializePageInfo( |
| 841 DevToolsHttpHandlerImpl::CreatePageInfo(RenderViewHost* rvh, | 808 RenderViewHost* rvh, |
| 842 DevToolsHttpHandlerDelegate::TargetType type) { | 809 const std::string& host) { |
| 843 RenderViewHostDelegate* host_delegate = rvh->GetDelegate(); | 810 base::DictionaryValue* dictionary = new base::DictionaryValue; |
| 811 |
| 844 scoped_refptr<DevToolsAgentHost> agent(DevToolsAgentHost::GetFor(rvh)); | 812 scoped_refptr<DevToolsAgentHost> agent(DevToolsAgentHost::GetFor(rvh)); |
| 845 DevToolsClientHost* client_host = DevToolsManager::GetInstance()-> | |
| 846 GetDevToolsClientHostFor(agent); | |
| 847 PageInfo page_info; | |
| 848 page_info.id = binding_->GetIdentifier(agent); | |
| 849 page_info.attached = client_host != NULL; | |
| 850 page_info.url = host_delegate->GetURL().spec(); | |
| 851 | 813 |
| 852 switch (type) { | 814 std::string id = binding_->GetIdentifier(agent); |
| 815 dictionary->SetString("id", id); |
| 816 |
| 817 switch (delegate_->GetTargetType(rvh)) { |
| 853 case DevToolsHttpHandlerDelegate::kTargetTypeTab: | 818 case DevToolsHttpHandlerDelegate::kTargetTypeTab: |
| 854 page_info.type = "page"; | 819 dictionary->SetString("type", "page"); |
| 855 break; | 820 break; |
| 856 default: | 821 default: |
| 857 page_info.type = "other"; | 822 dictionary->SetString("type", "other"); |
| 858 } | 823 } |
| 859 | 824 |
| 860 WebContents* web_contents = host_delegate->GetAsWebContents(); | 825 WebContents* web_contents = rvh->GetDelegate()->GetAsWebContents(); |
| 861 if (web_contents) { | 826 if (web_contents) { |
| 862 page_info.title = UTF16ToUTF8( | 827 dictionary->SetString("title", UTF16ToUTF8( |
| 863 net::EscapeForHTML(web_contents->GetTitle())); | 828 net::EscapeForHTML(web_contents->GetTitle()))); |
| 864 page_info.last_selected_time = web_contents->GetLastSelectedTime(); | 829 dictionary->SetString("url", web_contents->GetURL().spec()); |
| 830 dictionary->SetString("thumbnailUrl", std::string(kThumbUrlPrefix) + id); |
| 865 | 831 |
| 866 NavigationController& controller = web_contents->GetController(); | 832 NavigationController& controller = web_contents->GetController(); |
| 867 NavigationEntry* entry = controller.GetActiveEntry(); | 833 NavigationEntry* entry = controller.GetActiveEntry(); |
| 868 if (entry != NULL && entry->GetURL().is_valid()) { | 834 if (entry != NULL && entry->GetURL().is_valid()) { |
| 869 page_info.thumbnail_url = "/thumb/" + entry->GetURL().spec(); | 835 dictionary->SetString("faviconUrl", entry->GetFavicon().url.spec()); |
| 870 page_info.favicon_url = entry->GetFavicon().url.spec(); | |
| 871 } | 836 } |
| 872 } | 837 } |
| 873 return page_info; | |
| 874 } | |
| 875 | 838 |
| 876 base::DictionaryValue* DevToolsHttpHandlerImpl::SerializePageInfo( | 839 if (!DevToolsManager::GetInstance()->GetDevToolsClientHostFor(agent)) { |
| 877 const PageInfo& page_info, | |
| 878 const std::string& host) { | |
| 879 base::DictionaryValue* dictionary = new base::DictionaryValue; | |
| 880 dictionary->SetString("title", page_info.title); | |
| 881 dictionary->SetString("url", page_info.url); | |
| 882 dictionary->SetString("type", page_info.type); | |
| 883 dictionary->SetString("id", page_info.id); | |
| 884 dictionary->SetString("thumbnailUrl", page_info.thumbnail_url); | |
| 885 dictionary->SetString("faviconUrl", page_info.favicon_url); | |
| 886 if (!page_info.attached) { | |
| 887 dictionary->SetString("webSocketDebuggerUrl", | 840 dictionary->SetString("webSocketDebuggerUrl", |
| 888 base::StringPrintf("ws://%s/devtools/page/%s", | 841 base::StringPrintf("ws://%s/devtools/page/%s", |
| 889 host.c_str(), | 842 host.c_str(), |
| 890 page_info.id.c_str())); | 843 id.c_str())); |
| 891 std::string devtools_frontend_url = GetFrontendURLInternal( | 844 std::string devtools_frontend_url = GetFrontendURLInternal( |
| 892 page_info.id.c_str(), | 845 id.c_str(), |
| 893 host); | 846 host); |
| 894 dictionary->SetString("devtoolsFrontendUrl", devtools_frontend_url); | 847 dictionary->SetString("devtoolsFrontendUrl", devtools_frontend_url); |
| 895 } | 848 } |
| 896 return dictionary; | 849 return dictionary; |
| 897 } | 850 } |
| 898 | 851 |
| 899 } // namespace content | 852 } // namespace content |
| OLD | NEW |