diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-29 20:49:12 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-29 20:49:12 +0000 |
| commit | 617ee9611cebaccd41db63f5dbd2c1ca286d34e9 (patch) | |
| tree | f413420c03b33535f389dc1c9ca0d3f76c42b258 /chrome/browser/ui/views/browser_actions_container.cc | |
| parent | f3b279e8b3551706b8c95d11a8b476d3e43a5dfa (diff) | |
| download | chromium_src-617ee9611cebaccd41db63f5dbd2c1ca286d34e9.zip chromium_src-617ee9611cebaccd41db63f5dbd2c1ca286d34e9.tar.gz chromium_src-617ee9611cebaccd41db63f5dbd2c1ca286d34e9.tar.bz2 | |
Remove TabStripModel wrapper use.
BUG=167548
TEST=no functional change
Review URL: https://chromiumcodereview.appspot.com/12051054
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179407 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/browser_actions_container.cc')
| -rw-r--r-- | chrome/browser/ui/views/browser_actions_container.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc index 212c847..46ee3f6 100644 --- a/chrome/browser/ui/views/browser_actions_container.cc +++ b/chrome/browser/ui/views/browser_actions_container.cc @@ -13,7 +13,7 @@ #include "chrome/browser/profiles/profile.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/tabs/tab_strip_model.h" #include "chrome/browser/ui/view_ids.h" #include "chrome/browser/ui/views/browser_action_view.h" #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h" @@ -474,7 +474,8 @@ void BrowserActionsContainer::InspectPopup(ExtensionAction* action) { } int BrowserActionsContainer::GetCurrentTabId() const { - content::WebContents* active_tab = chrome::GetActiveWebContents(browser_); + content::WebContents* active_tab = + browser_->tab_strip_model()->GetActiveWebContents(); if (!active_tab) return -1; @@ -498,7 +499,8 @@ gfx::Point BrowserActionsContainer::GetViewContentOffset() const { extensions::ActiveTabPermissionGranter* BrowserActionsContainer::GetActiveTabPermissionGranter() { - content::WebContents* web_contents = chrome::GetActiveWebContents(browser_); + content::WebContents* web_contents = + browser_->tab_strip_model()->GetActiveWebContents(); if (!web_contents) return NULL; return extensions::TabHelper::FromWebContents(web_contents)-> |