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 // Implements the Chrome Extensions Debugger API. | 5 // Implements the Chrome Extensions Debugger API. |
6 | 6 |
7 #include "chrome/browser/extensions/api/debugger/debugger_api.h" | 7 #include "chrome/browser/extensions/api/debugger/debugger_api.h" |
8 | 8 |
9 #include <map> | 9 #include <map> |
10 #include <set> | 10 #include <set> |
11 | 11 |
12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
13 #include "base/json/json_reader.h" | 13 #include "base/json/json_reader.h" |
14 #include "base/json/json_writer.h" | 14 #include "base/json/json_writer.h" |
15 #include "base/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
16 #include "base/memory/singleton.h" | 16 #include "base/memory/singleton.h" |
17 #include "base/stl_util.h" | 17 #include "base/stl_util.h" |
18 #include "base/strings/string_number_conversions.h" | 18 #include "base/strings/string_number_conversions.h" |
19 #include "base/strings/utf_string_conversions.h" | 19 #include "base/strings/utf_string_conversions.h" |
20 #include "base/values.h" | 20 #include "base/values.h" |
21 #include "chrome/browser/chrome_notification_types.h" | 21 #include "chrome/browser/chrome_notification_types.h" |
22 #include "chrome/browser/devtools/devtools_target_impl.h" | 22 #include "chrome/browser/devtools/devtools_target_impl.h" |
23 #include "chrome/browser/extensions/api/debugger/debugger_api_constants.h" | 23 #include "chrome/browser/extensions/api/debugger/debugger_api_constants.h" |
24 #include "chrome/browser/extensions/extension_service.h" | 24 #include "chrome/browser/extensions/extension_service.h" |
25 #include "chrome/browser/extensions/extension_tab_util.h" | 25 #include "chrome/browser/extensions/extension_tab_util.h" |
26 #include "chrome/browser/infobars/confirm_infobar_delegate.h" | 26 #include "chrome/browser/infobars/confirm_infobar_delegate.h" |
27 #include "chrome/browser/infobars/infobar.h" | 27 #include "chrome/browser/infobars/infobar.h" |
| 28 #include "chrome/browser/infobars/infobar_manager.h" |
28 #include "chrome/browser/infobars/infobar_service.h" | 29 #include "chrome/browser/infobars/infobar_service.h" |
29 #include "chrome/browser/profiles/profile.h" | 30 #include "chrome/browser/profiles/profile.h" |
30 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" | 31 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" |
31 #include "chrome/common/chrome_switches.h" | 32 #include "chrome/common/chrome_switches.h" |
32 #include "content/public/browser/devtools_agent_host.h" | 33 #include "content/public/browser/devtools_agent_host.h" |
33 #include "content/public/browser/devtools_client_host.h" | 34 #include "content/public/browser/devtools_client_host.h" |
34 #include "content/public/browser/devtools_http_handler.h" | 35 #include "content/public/browser/devtools_http_handler.h" |
35 #include "content/public/browser/devtools_manager.h" | 36 #include "content/public/browser/devtools_manager.h" |
36 #include "content/public/browser/notification_service.h" | 37 #include "content/public/browser/notification_service.h" |
37 #include "content/public/browser/notification_source.h" | 38 #include "content/public/browser/notification_source.h" |
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
332 } | 333 } |
333 | 334 |
334 ExtensionDevToolsClientHost::~ExtensionDevToolsClientHost() { | 335 ExtensionDevToolsClientHost::~ExtensionDevToolsClientHost() { |
335 // Ensure calling RemoveInfoBar() below won't result in Observe() trying to | 336 // Ensure calling RemoveInfoBar() below won't result in Observe() trying to |
336 // Close() us. | 337 // Close() us. |
337 registrar_.RemoveAll(); | 338 registrar_.RemoveAll(); |
338 | 339 |
339 if (infobar_) { | 340 if (infobar_) { |
340 static_cast<ExtensionDevToolsInfoBarDelegate*>( | 341 static_cast<ExtensionDevToolsInfoBarDelegate*>( |
341 infobar_->delegate())->set_client_host(NULL); | 342 infobar_->delegate())->set_client_host(NULL); |
342 InfoBarService::FromWebContents(WebContents::FromRenderViewHost( | 343 InfoBarService* infobar_service = InfoBarService::FromWebContents( |
343 agent_host_->GetRenderViewHost()))->RemoveInfoBar(infobar_); | 344 WebContents::FromRenderViewHost(agent_host_->GetRenderViewHost())); |
| 345 infobar_service->infobar_manager().RemoveInfoBar(infobar_); |
344 } | 346 } |
345 AttachedClientHosts::GetInstance()->Remove(this); | 347 AttachedClientHosts::GetInstance()->Remove(this); |
346 } | 348 } |
347 | 349 |
348 // DevToolsClientHost interface | 350 // DevToolsClientHost interface |
349 void ExtensionDevToolsClientHost::InspectedContentsClosing() { | 351 void ExtensionDevToolsClientHost::InspectedContentsClosing() { |
350 SendDetachedEvent(); | 352 SendDetachedEvent(); |
351 delete this; | 353 delete this; |
352 } | 354 } |
353 | 355 |
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
711 | 713 |
712 void DebuggerGetTargetsFunction::SendTargetList( | 714 void DebuggerGetTargetsFunction::SendTargetList( |
713 const std::vector<DevToolsTargetImpl*>& target_list) { | 715 const std::vector<DevToolsTargetImpl*>& target_list) { |
714 scoped_ptr<base::ListValue> result(new base::ListValue()); | 716 scoped_ptr<base::ListValue> result(new base::ListValue()); |
715 for (size_t i = 0; i < target_list.size(); ++i) | 717 for (size_t i = 0; i < target_list.size(); ++i) |
716 result->Append(SerializeTarget(*target_list[i])); | 718 result->Append(SerializeTarget(*target_list[i])); |
717 STLDeleteContainerPointers(target_list.begin(), target_list.end()); | 719 STLDeleteContainerPointers(target_list.begin(), target_list.end()); |
718 SetResult(result.release()); | 720 SetResult(result.release()); |
719 SendResponse(true); | 721 SendResponse(true); |
720 } | 722 } |
OLD | NEW |