diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-14 22:15:00 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-14 22:15:00 +0000 |
| commit | 81898992dcbade4de1c6e6ca8953e7fdf0669599 (patch) | |
| tree | 6c58bf4ce15c75cf4f45331a2bf2fa73ecfbb0eb /chrome/browser/debugger/devtools_window.cc | |
| parent | e87b8b518d43c0342367c0f710299a5dc9ef2e4b (diff) | |
| download | chromium_src-81898992dcbade4de1c6e6ca8953e7fdf0669599.zip chromium_src-81898992dcbade4de1c6e6ca8953e7fdf0669599.tar.gz chromium_src-81898992dcbade4de1c6e6ca8953e7fdf0669599.tar.bz2 | |
Moves NavigationController::session_id into RestoreTabHelper.
BUG=none
TEST=none
R=nick@chromium.org,mpcomplete@chromium.org,jam@chromium.org
Review URL: http://codereview.chromium.org/7104064
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89083 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/debugger/devtools_window.cc')
| -rw-r--r-- | chrome/browser/debugger/devtools_window.cc | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc index 89b32a6..4dbf6fd 100644 --- a/chrome/browser/debugger/devtools_window.cc +++ b/chrome/browser/debugger/devtools_window.cc @@ -15,6 +15,7 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/sessions/restore_tab_helper.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" @@ -91,7 +92,8 @@ DevToolsWindow::DevToolsWindow(Profile* profile, Source<NavigationController>(&tab_contents_->controller())); registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED, NotificationService::AllSources()); - inspected_tab_ = inspected_rvh->delegate()->GetAsTabContents(); + inspected_tab_ = TabContentsWrapper::GetCurrentWrapperForContents( + inspected_rvh->delegate()->GetAsTabContents()); } DevToolsWindow::~DevToolsWindow() { @@ -132,7 +134,7 @@ void DevToolsWindow::InspectedTabClosing() { void DevToolsWindow::TabReplaced(TabContentsWrapper* new_tab) { DCHECK_EQ(profile_, new_tab->profile()); - inspected_tab_ = new_tab->tab_contents(); + inspected_tab_ = new_tab; } void DevToolsWindow::Show(DevToolsToggleAction action) { @@ -288,7 +290,8 @@ void DevToolsWindow::UpdateFrontendAttachedState() { void DevToolsWindow::AddDevToolsExtensionsToClient() { if (inspected_tab_) { - FundamentalValue tabId(inspected_tab_->controller().session_id().id()); + FundamentalValue tabId( + inspected_tab_->restore_tab_helper()->session_id().id()); CallClientFunction(ASCIIToUTF16("WebInspector.setInspectedTabId"), tabId); } ListValue results; @@ -317,11 +320,10 @@ void DevToolsWindow::OpenURLFromTab(TabContents* source, const GURL& referrer, WindowOpenDisposition disposition, PageTransition::Type transition) { - if (inspected_tab_) - inspected_tab_->OpenURL(url, - GURL(), - NEW_FOREGROUND_TAB, - PageTransition::LINK); + if (inspected_tab_) { + inspected_tab_->tab_contents()->OpenURL( + url, GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK); + } } void DevToolsWindow::CallClientFunction(const string16& function_name, @@ -430,11 +432,8 @@ void DevToolsWindow::AddNewContents(TabContents* source, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, bool user_gesture) { - inspected_tab_->delegate()->AddNewContents(source, - new_contents, - disposition, - initial_pos, - user_gesture); + inspected_tab_->tab_contents()->delegate()->AddNewContents( + source, new_contents, disposition, initial_pos, user_gesture); } bool DevToolsWindow::CanReloadContents(TabContents* source) const { |