diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 17:27:31 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 17:27:31 +0000 |
| commit | 3df2f1ad335dce38556f7a91de9895c6a489732e (patch) | |
| tree | c5f6e18014b090c50788b737c57f1254cd04d042 /chrome/browser/extensions/extension_tab_util.cc | |
| parent | e755a38521ce846021826bdaff698e4151e923c4 (diff) | |
| download | chromium_src-3df2f1ad335dce38556f7a91de9895c6a489732e.zip chromium_src-3df2f1ad335dce38556f7a91de9895c6a489732e.tar.gz chromium_src-3df2f1ad335dce38556f7a91de9895c6a489732e.tar.bz2 | |
Make SessionID tolerant of non-tabs.
This reverts r156144.
BUG=107201
TEST=no crashes
Review URL: https://chromiumcodereview.appspot.com/10915246
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156570 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_tab_util.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_tab_util.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc index 1421368..09d20e0 100644 --- a/chrome/browser/extensions/extension_tab_util.cc +++ b/chrome/browser/extensions/extension_tab_util.cc @@ -10,7 +10,6 @@ #include "chrome/browser/net/url_fixer_upper.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_list.h" @@ -50,9 +49,6 @@ int ExtensionTabUtil::GetWindowIdOfTabStripModel( } int ExtensionTabUtil::GetTabId(const WebContents* web_contents) { - // TODO(avi): Make IdForTab return -1 for non-tabs. - if (!SessionTabHelper::FromWebContents(web_contents)) - return -1; return SessionID::IdForTab(web_contents); } @@ -61,9 +57,6 @@ std::string ExtensionTabUtil::GetTabStatusText(bool is_loading) { } int ExtensionTabUtil::GetWindowIdOfTab(const WebContents* web_contents) { - // TODO(avi): Make IdForWindowContainingTab return -1 for non-tabs. - if (!SessionTabHelper::FromWebContents(web_contents)) - return -1; return SessionID::IdForWindowContainingTab(web_contents); } |