diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-19 18:27:09 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-19 18:27:09 +0000 |
| commit | 810e622b58b4da015c11e8b6c71f3e95b23afe1b (patch) | |
| tree | 56c0cf5e6ab1e6ea3f0a4a5cc8c26d0cd651d24f /chrome/browser/extensions | |
| parent | f38b16fd2753b2d603e0a2a137227a132c77057b (diff) | |
| download | chromium_src-810e622b58b4da015c11e8b6c71f3e95b23afe1b.zip chromium_src-810e622b58b4da015c11e8b6c71f3e95b23afe1b.tar.gz chromium_src-810e622b58b4da015c11e8b6c71f3e95b23afe1b.tar.bz2 | |
Fix inspection of extensions.
As a bonus, debugging of extensions now works. Go OOP inspector team!
Inspection code was calling RVHD::GetProfile(), which was not implemented by ExtensionHost. Looking into this, it seems better to just remove the method from the interface since Profile is already accessible by way of RVH.
The only caller to RVHD::GetProfile() besides the inspector was HWNDHtmlView which is itself dead code, so I removed it too.
Review URL: http://codereview.chromium.org/115501
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16392 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
| -rw-r--r-- | chrome/browser/extensions/extension_host.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/extensions/extension_host.h | 2 | ||||
| -rw-r--r-- | chrome/browser/extensions/extensions_ui.cc | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc index a38fdd5..61f7a41 100644 --- a/chrome/browser/extensions/extension_host.cc +++ b/chrome/browser/extensions/extension_host.cc @@ -7,6 +7,8 @@ #include "app/resource_bundle.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" +#include "chrome/browser/browser_process.h" +#include "chrome/browser/debugger/devtools_manager.h" #include "chrome/browser/extensions/extension.h" #include "chrome/browser/extensions/extension_message_service.h" #include "chrome/browser/extensions/extension_view.h" @@ -140,7 +142,7 @@ void ExtensionHost::ShowCreatedWidget(int route_id, void ExtensionHost::ShowContextMenu(const ContextMenuParams& params) { // TODO(erikkay) - This is a temporary hack. Show a menu here instead. - render_view_host()->InspectElementAt(params.x, params.y); + g_browser_process->devtools_manager()->OpenDevToolsWindow(render_view_host()); } void ExtensionHost::StartDragging(const WebDropData& drop_data) { diff --git a/chrome/browser/extensions/extension_host.h b/chrome/browser/extensions/extension_host.h index a6e19d9..fc5e0ca 100644 --- a/chrome/browser/extensions/extension_host.h +++ b/chrome/browser/extensions/extension_host.h @@ -40,8 +40,6 @@ class ExtensionHost : public RenderViewHostDelegate, void CreateRenderView(const GURL& url, RenderWidgetHostView* host_view); // RenderViewHostDelegate - // TODO(mpcomplete): GetProfile is unused. - virtual Profile* GetProfile() const { return NULL; } virtual const GURL& GetURL() const { return url_; } virtual WebPreferences GetWebkitPrefs(); virtual void RunJavaScriptMessage( diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc index d05e39a..e150840 100644 --- a/chrome/browser/extensions/extensions_ui.cc +++ b/chrome/browser/extensions/extensions_ui.cc @@ -9,6 +9,7 @@ #include "base/string_util.h" #include "base/thread.h" #include "chrome/browser/browser_process.h" +#include "chrome/browser/debugger/devtools_manager.h" #include "chrome/browser/extensions/extension.h" #include "chrome/browser/extensions/extension_message_service.h" #include "chrome/browser/extensions/extensions_service.h" @@ -114,7 +115,7 @@ void ExtensionsDOMHandler::HandleInspectMessage(const Value* value) { return; } - host->InspectElementAt(0, 0); + g_browser_process->devtools_manager()->OpenDevToolsWindow(host); } static void CreateScriptFileDetailValue( |