OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "chrome/browser/debugger/devtools_manager.h" | 5 #include "chrome/browser/debugger/devtools_manager.h" |
6 | 6 |
7 #include "chrome/browser/browser_process.h" | |
8 #include "chrome/browser/debugger/devtools_window.h" | 7 #include "chrome/browser/debugger/devtools_window.h" |
9 #include "chrome/browser/renderer_host/render_view_host.h" | 8 #include "chrome/browser/renderer_host/render_view_host.h" |
10 #include "chrome/browser/tab_contents/render_view_host_manager.h" | |
11 #include "chrome/browser/tab_contents/tab_contents.h" | 9 #include "chrome/browser/tab_contents/tab_contents.h" |
12 #include "chrome/browser/tab_contents/web_contents.h" | 10 #include "chrome/browser/tab_contents/web_contents.h" |
13 #include "chrome/common/notification_registrar.h" | 11 #include "chrome/common/notification_registrar.h" |
14 #include "chrome/common/notification_type.h" | 12 #include "chrome/common/notification_type.h" |
15 | 13 |
16 | 14 |
17 class DevToolsInstanceDescriptorImpl : public DevToolsInstanceDescriptor { | 15 class DevToolsInstanceDescriptorImpl : public DevToolsInstanceDescriptor { |
18 public: | 16 public: |
19 explicit DevToolsInstanceDescriptorImpl( | 17 explicit DevToolsInstanceDescriptorImpl( |
| 18 DevToolsManager* manager, |
20 NavigationController* navigation_controller) | 19 NavigationController* navigation_controller) |
21 : navigation_controller_(navigation_controller), | 20 : manager_(manager), |
| 21 navigation_controller_(navigation_controller), |
22 devtools_host_(NULL), | 22 devtools_host_(NULL), |
23 devtools_window_(NULL) { | 23 devtools_window_(NULL) { |
24 } | 24 } |
25 virtual ~DevToolsInstanceDescriptorImpl() {} | 25 virtual ~DevToolsInstanceDescriptorImpl() {} |
26 | 26 |
27 virtual void SetDevToolsHost(RenderViewHost* render_view_host) { | 27 virtual void SetDevToolsHost(RenderViewHost* render_view_host) { |
28 devtools_host_ = render_view_host; | 28 devtools_host_ = render_view_host; |
29 } | 29 } |
30 | 30 |
31 virtual void SetDevToolsWindow(DevToolsWindow* window) { | 31 virtual void SetDevToolsWindow(DevToolsWindow* window) { |
32 devtools_window_ = window; | 32 devtools_window_ = window; |
33 } | 33 } |
34 | 34 |
35 virtual void Destroy() { | 35 virtual void Destroy() { |
36 DevToolsManager* manager = g_browser_process->devtools_manager(); | 36 manager_->RemoveDescriptor(this); |
37 DCHECK(manager); | |
38 if (manager) { | |
39 manager->RemoveDescriptor(this); | |
40 } | |
41 delete this; | 37 delete this; |
42 } | 38 } |
43 | 39 |
44 RenderViewHost* devtools_host() const { | 40 RenderViewHost* devtools_host() const { |
45 return devtools_host_; | 41 return devtools_host_; |
46 } | 42 } |
47 | 43 |
48 DevToolsWindow* devtools_window() const { | 44 DevToolsWindow* devtools_window() const { |
49 return devtools_window_; | 45 return devtools_window_; |
50 } | 46 } |
51 | 47 |
52 NavigationController* navigation_controller() const { | 48 NavigationController* navigation_controller() const { |
53 return navigation_controller_; | 49 return navigation_controller_; |
54 } | 50 } |
55 | 51 |
56 private: | 52 private: |
| 53 DevToolsManager* manager_; |
57 NavigationController* navigation_controller_; | 54 NavigationController* navigation_controller_; |
58 RenderViewHost* devtools_host_; | 55 RenderViewHost* devtools_host_; |
59 DevToolsWindow* devtools_window_; | 56 DevToolsWindow* devtools_window_; |
60 | 57 |
61 DISALLOW_COPY_AND_ASSIGN(DevToolsInstanceDescriptorImpl); | 58 DISALLOW_COPY_AND_ASSIGN(DevToolsInstanceDescriptorImpl); |
62 }; | 59 }; |
63 | 60 |
64 DevToolsManager::DevToolsManager() : web_contents_listeners_(NULL) { | 61 DevToolsManager::DevToolsManager(DevToolsWindowFactory* factory) |
| 62 : web_contents_listeners_(NULL), |
| 63 devtools_window_factory_(factory) { |
65 } | 64 } |
66 | 65 |
67 DevToolsManager::~DevToolsManager() { | 66 DevToolsManager::~DevToolsManager() { |
68 DCHECK(!web_contents_listeners_.get()) << | 67 DCHECK(!web_contents_listeners_.get()) << |
69 "All devtools windows must alredy have been closed."; | 68 "All devtools windows must alredy have been closed."; |
70 } | 69 } |
71 | 70 |
| 71 DevToolsWindow* DevToolsManager::CreateDevToolsWindow( |
| 72 DevToolsInstanceDescriptor* descriptor) { |
| 73 if (devtools_window_factory_) { |
| 74 return devtools_window_factory_->CreateDevToolsWindow(descriptor); |
| 75 } else { |
| 76 return DevToolsWindow::Create(descriptor); |
| 77 } |
| 78 } |
| 79 |
72 void DevToolsManager::Observe(NotificationType type, | 80 void DevToolsManager::Observe(NotificationType type, |
73 const NotificationSource& source, | 81 const NotificationSource& source, |
74 const NotificationDetails& details) { | 82 const NotificationDetails& details) { |
75 DCHECK(type == NotificationType::WEB_CONTENTS_DISCONNECTED); | 83 DCHECK(type == NotificationType::WEB_CONTENTS_DISCONNECTED); |
76 Source<WebContents> src(source); | 84 Source<WebContents> src(source); |
77 NavigationController* controller = src->controller(); | 85 NavigationController* controller = src->controller(); |
78 DescriptorMap::const_iterator it = | 86 DescriptorMap::const_iterator it = |
79 navcontroller_to_descriptor_.find(controller); | 87 navcontroller_to_descriptor_.find(controller); |
80 if (it == navcontroller_to_descriptor_.end()) { | 88 if (it == navcontroller_to_descriptor_.end()) { |
81 return; | 89 return; |
(...skipping 11 matching lines...) Expand all Loading... |
93 NavigationController* navigation_controller = web_contents->controller(); | 101 NavigationController* navigation_controller = web_contents->controller(); |
94 | 102 |
95 DevToolsWindow* window(NULL); | 103 DevToolsWindow* window(NULL); |
96 DevToolsInstanceDescriptorImpl* desc(NULL); | 104 DevToolsInstanceDescriptorImpl* desc(NULL); |
97 DescriptorMap::const_iterator it = | 105 DescriptorMap::const_iterator it = |
98 navcontroller_to_descriptor_.find(navigation_controller); | 106 navcontroller_to_descriptor_.find(navigation_controller); |
99 if (it != navcontroller_to_descriptor_.end()) { | 107 if (it != navcontroller_to_descriptor_.end()) { |
100 desc = it->second; | 108 desc = it->second; |
101 window = desc->devtools_window(); | 109 window = desc->devtools_window(); |
102 } else { | 110 } else { |
103 desc = new DevToolsInstanceDescriptorImpl(navigation_controller); | 111 desc = new DevToolsInstanceDescriptorImpl(this, navigation_controller); |
104 navcontroller_to_descriptor_[navigation_controller] = desc; | 112 navcontroller_to_descriptor_[navigation_controller] = desc; |
105 | 113 |
106 StartListening(navigation_controller); | 114 StartListening(navigation_controller); |
107 | 115 |
108 window = DevToolsWindow::Create(desc); | 116 window = CreateDevToolsWindow(desc); |
109 } | 117 } |
110 | 118 |
111 window->Show(); | 119 window->Show(); |
112 } | 120 } |
113 | 121 |
114 void DevToolsManager::ForwardToDevToolsAgent(RenderViewHost* from, | 122 void DevToolsManager::ForwardToDevToolsAgent(RenderViewHost* from, |
115 const IPC::Message& message) { | 123 const IPC::Message& message) { |
116 NavigationController* nav_controller(NULL); | 124 NavigationController* nav_controller(NULL); |
117 for (DescriptorMap::const_iterator it = navcontroller_to_descriptor_.begin(); | 125 for (DescriptorMap::const_iterator it = navcontroller_to_descriptor_.begin(); |
118 it != navcontroller_to_descriptor_.end(); | 126 it != navcontroller_to_descriptor_.end(); |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
193 } | 201 } |
194 } | 202 } |
195 | 203 |
196 void DevToolsManager::StopListening( | 204 void DevToolsManager::StopListening( |
197 NavigationController* navigation_controller) { | 205 NavigationController* navigation_controller) { |
198 DCHECK(web_contents_listeners_.get()); | 206 DCHECK(web_contents_listeners_.get()); |
199 if (navcontroller_to_descriptor_.empty()) { | 207 if (navcontroller_to_descriptor_.empty()) { |
200 web_contents_listeners_.reset(); | 208 web_contents_listeners_.reset(); |
201 } | 209 } |
202 } | 210 } |
OLD | NEW |