summaryrefslogtreecommitdiffstats
path: root/chrome/browser/automation/automation_util.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-30 17:28:56 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-30 17:28:56 +0000
commitbde40b826e9edafbbb5f372f68dcdb3ab1558e56 (patch)
tree73924916a5344a1c23262ba6dff17664b82cef53 /chrome/browser/automation/automation_util.cc
parentc32fff5aca16f0b59a6ba1f5e59cbc5de2b19708 (diff)
downloadchromium_src-bde40b826e9edafbbb5f372f68dcdb3ab1558e56.zip
chromium_src-bde40b826e9edafbbb5f372f68dcdb3ab1558e56.tar.gz
chromium_src-bde40b826e9edafbbb5f372f68dcdb3ab1558e56.tar.bz2
RestoreTabHelper > SessionTabHelper, move more session stuff into it.
BUG=107201 TEST=no change Review URL: https://chromiumcodereview.appspot.com/10891044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154186 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation/automation_util.cc')
-rw-r--r--chrome/browser/automation/automation_util.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/automation/automation_util.cc b/chrome/browser/automation/automation_util.cc
index c927359..f65fad6 100644
--- a/chrome/browser/automation/automation_util.cc
+++ b/chrome/browser/automation/automation_util.cc
@@ -19,8 +19,8 @@
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/printing/print_preview_tab_controller.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/sessions/restore_tab_helper.h"
#include "chrome/browser/sessions/session_id.h"
+#include "chrome/browser/sessions/session_tab_helper.h"
#include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_list.h"
@@ -411,7 +411,7 @@ bool SendErrorIfModalDialogActive(AutomationProvider* provider,
AutomationId GetIdForTab(const TabContents* tab) {
return AutomationId(
AutomationId::kTypeTab,
- base::IntToString(tab->restore_tab_helper()->session_id().id()));
+ base::IntToString(tab->session_tab_helper()->session_id().id()));
}
AutomationId GetIdForExtensionView(
@@ -459,7 +459,7 @@ bool GetTabForId(const AutomationId& id, WebContents** tab) {
for (int tab_index = 0; tab_index < browser->tab_count(); ++tab_index) {
TabContents* tab_contents = chrome::GetTabContentsAt(browser, tab_index);
if (base::IntToString(
- tab_contents->restore_tab_helper()->session_id().id()) ==
+ tab_contents->session_tab_helper()->session_id().id()) ==
id.id()) {
*tab = tab_contents->web_contents();
return true;
@@ -469,7 +469,7 @@ bool GetTabForId(const AutomationId& id, WebContents** tab) {
preview_controller->GetPrintPreviewForTab(tab_contents);
if (preview_tab_contents) {
std::string preview_id = base::IntToString(
- preview_tab_contents->restore_tab_helper()->session_id().id());
+ preview_tab_contents->session_tab_helper()->session_id().id());
if (preview_id == id.id()) {
*tab = preview_tab_contents->web_contents();
return true;