chrome/browser/extensions/api/extension_action/page_action_apitest.cc - Issue 10891044: RestoreTabHelper > SessionTabHelper, move more session stuff into it.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/extension_action/page_action_apitest.cc

Issue 10891044: RestoreTabHelper > SessionTabHelper, move more session stuff into it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/debugger/devtools_window.cc ('k') | chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/extension_action/page_action_apitest.cc

diff --git a/chrome/browser/extensions/api/extension_action/page_action_apitest.cc b/chrome/browser/extensions/api/extension_action/page_action_apitest.cc

index b6f1cc6ed2d084e3a698d4fc17a5007f5d64a3dc..b2ffd0cc780145e4274e2e7d7ce66941c4017b3c 100644

--- a/chrome/browser/extensions/api/extension_action/page_action_apitest.cc

+++ b/chrome/browser/extensions/api/extension_action/page_action_apitest.cc

@@ -7,7 +7,7 @@

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/extensions/extension_tab_util.h"

#include "chrome/browser/profiles/profile.h"

-#include "chrome/browser/sessions/restore_tab_helper.h"

+#include "chrome/browser/sessions/session_tab_helper.h"

#include "chrome/browser/ui/browser.h"

#include "chrome/browser/ui/browser_tabstrip.h"

#include "chrome/browser/ui/browser_window.h"

@@ -34,7 +34,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PageAction) {

}

// Test that we received the changes.

- int tab_id = chrome::GetActiveTabContents(browser())->restore_tab_helper()->

+ int tab_id = chrome::GetActiveTabContents(browser())->session_tab_helper()->

session_id().id();

ExtensionAction* action = extension->page_action();

ASSERT_TRUE(action);

@@ -60,7 +60,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PageAction) {

}

// Test that we received the changes.

- tab_id = chrome::GetActiveTabContents(browser())->restore_tab_helper()->

+ tab_id = chrome::GetActiveTabContents(browser())->session_tab_helper()->

session_id().id();

EXPECT_FALSE(action->GetIcon(tab_id).IsEmpty());

}