summaryrefslogtreecommitdiffstats
path: root/chrome/browser/debugger
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-25 20:25:14 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-25 20:25:14 +0000
commite3690ed3662cf26f2231a6495cdc4f21ec3fb116 (patch)
tree6cad2d56d101723e27dd17ae00920d9603f26dae /chrome/browser/debugger
parentedc1ba641c9e0ace8b05d306638379d22e5be8f1 (diff)
downloadchromium_src-e3690ed3662cf26f2231a6495cdc4f21ec3fb116.zip
chromium_src-e3690ed3662cf26f2231a6495cdc4f21ec3fb116.tar.gz
chromium_src-e3690ed3662cf26f2231a6495cdc4f21ec3fb116.tar.bz2
Moves instant related methods off TabContents and to where they are used.
R=estade@chromium.org,avi@chromium.org BUG=77091 TEST=none Review URL: http://codereview.chromium.org/6729010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79447 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/debugger')
-rw-r--r--chrome/browser/debugger/devtools_window.cc5
-rw-r--r--chrome/browser/debugger/devtools_window.h2
2 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc
index 345fadc..5bb68db 100644
--- a/chrome/browser/debugger/devtools_window.cc
+++ b/chrome/browser/debugger/devtools_window.cc
@@ -37,7 +37,8 @@
const char DevToolsWindow::kDevToolsApp[] = "DevToolsApp";
// static
-TabContents* DevToolsWindow::GetDevToolsContents(TabContents* inspected_tab) {
+TabContentsWrapper* DevToolsWindow::GetDevToolsContents(
+ TabContents* inspected_tab) {
if (!inspected_tab) {
return NULL;
}
@@ -55,7 +56,7 @@ TabContents* DevToolsWindow::GetDevToolsContents(TabContents* inspected_tab) {
if (!window || !window->is_docked()) {
return NULL;
}
- return window->tab_contents()->tab_contents();
+ return window->tab_contents();
}
DevToolsWindow::DevToolsWindow(Profile* profile,
diff --git a/chrome/browser/debugger/devtools_window.h b/chrome/browser/debugger/devtools_window.h
index 668bd87..1d8f6f4 100644
--- a/chrome/browser/debugger/devtools_window.h
+++ b/chrome/browser/debugger/devtools_window.h
@@ -31,7 +31,7 @@ class DevToolsWindow
public TabContentsDelegate {
public:
static const char kDevToolsApp[];
- static TabContents* GetDevToolsContents(TabContents* inspected_tab);
+ static TabContentsWrapper* GetDevToolsContents(TabContents* inspected_tab);
DevToolsWindow(Profile* profile, RenderViewHost* inspected_rvh, bool docked);
virtual ~DevToolsWindow();