Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1251)

Unified Diff: chrome/browser/extensions/extension_tab_util.cc

Issue 480883002: Move session_id.{cc,h} from chrome/browser/sessions to components/sessions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
Index: chrome/browser/extensions/extension_tab_util.cc
diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc
index 350ea95dda719866c3ea1c744afb64a35ddfc822..75991084362ed7a7bf035ce92d800d3c9c5b584b 100644
--- a/chrome/browser/extensions/extension_tab_util.cc
+++ b/chrome/browser/extensions/extension_tab_util.cc
@@ -13,7 +13,7 @@
#include "chrome/browser/extensions/window_controller.h"
#include "chrome/browser/extensions/window_controller_list.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/sessions/session_id.h"
+#include "chrome/browser/sessions/session_tab_helper.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/browser_iterator.h"
@@ -289,7 +289,7 @@ int ExtensionTabUtil::GetWindowIdOfTabStripModel(
}
int ExtensionTabUtil::GetTabId(const WebContents* web_contents) {
- return SessionID::IdForTab(web_contents);
+ return SessionTabHelper::IdForTab(web_contents);
}
std::string ExtensionTabUtil::GetTabStatusText(bool is_loading) {
@@ -297,7 +297,7 @@ std::string ExtensionTabUtil::GetTabStatusText(bool is_loading) {
}
int ExtensionTabUtil::GetWindowIdOfTab(const WebContents* web_contents) {
- return SessionID::IdForWindowContainingTab(web_contents);
+ return SessionTabHelper::IdForWindowContainingTab(web_contents);
}
base::DictionaryValue* ExtensionTabUtil::CreateTabValue(
@@ -467,7 +467,7 @@ bool ExtensionTabUtil::GetTabById(int tab_id,
TabStripModel* target_tab_strip = target_browser->tab_strip_model();
for (int i = 0; i < target_tab_strip->count(); ++i) {
WebContents* target_contents = target_tab_strip->GetWebContentsAt(i);
- if (SessionID::IdForTab(target_contents) == tab_id) {
+ if (SessionTabHelper::IdForTab(target_contents) == tab_id) {
if (browser)
*browser = target_browser;
if (tab_strip)
« no previous file with comments | « chrome/browser/extensions/extension_keybinding_apitest.cc ('k') | chrome/browser/extensions/page_action_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698