diff options
| author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-07 06:27:41 +0000 |
|---|---|---|
| committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-07 06:27:41 +0000 |
| commit | 684b4ba293df8f279147ea9d4b4bc665ec44a153 (patch) | |
| tree | a712bd8032c65a38a0e8a0dffa2ed70286008f20 /chrome/browser/tab_contents | |
| parent | 122336cf5ea64521747cc22ec6bd0d918ba2e489 (diff) | |
| download | chromium_src-684b4ba293df8f279147ea9d4b4bc665ec44a153.zip chromium_src-684b4ba293df8f279147ea9d4b4bc665ec44a153.tar.gz chromium_src-684b4ba293df8f279147ea9d4b4bc665ec44a153.tar.bz2 | |
DevTools: Enable debugging of non-TabContents including extensions.
Review URL: http://codereview.chromium.org/115028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15526 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
| -rw-r--r-- | chrome/browser/tab_contents/render_view_context_menu.cc | 9 | ||||
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents.cc | 10 |
2 files changed, 7 insertions, 12 deletions
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index bde8749..35624d3 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -11,7 +11,6 @@ #include "base/scoped_clipboard_writer.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/debugger/devtools_manager.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url_model.h" @@ -636,13 +635,7 @@ void RenderViewContextMenu::CopyImageAt(int x, int y) { } void RenderViewContextMenu::Inspect(int x, int y) { - if (CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableOutOfProcessDevTools)) { - g_browser_process->devtools_manager()->InspectElement( - source_tab_contents_, x, y); - } else { - source_tab_contents_->render_view_host()->InspectElementAt(x, y); - } + source_tab_contents_->render_view_host()->InspectElementAt(x, y); } void RenderViewContextMenu::WriteTextToClipboard( diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index 14cdd22..4582bbe 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -678,10 +678,12 @@ bool TabContents::NavigateToPendingEntry(bool reload) { return false; // Unable to create the desired render view host. // Tell DevTools agent that it is attached prior to the navigation. - DevToolsManager* dev_tools_manager = g_browser_process->devtools_manager(); - if (dev_tools_manager) // NULL in unit tests. - dev_tools_manager->OnNavigatingToPendingEntry(*this, - dest_render_view_host); + DevToolsManager* devtools_manager = g_browser_process->devtools_manager(); + if (devtools_manager) // NULL in unit tests. + devtools_manager->OnNavigatingToPendingEntry( + render_view_host(), + dest_render_view_host, + controller_.pending_entry()->url()); // Used for page load time metrics. current_load_start_ = base::TimeTicks::Now(); |