diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-29 22:22:03 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-29 22:22:03 +0000 |
| commit | 52877dbc6c22a02dc7d1dd6f22de2c2b3e7eac17 (patch) | |
| tree | f39b0d32959778625fdeb00f178061a6411213c3 /chrome/browser/task_manager | |
| parent | 78ce87fbedda14f033aaaf474b94c4966e8bf3d0 (diff) | |
| download | chromium_src-52877dbc6c22a02dc7d1dd6f22de2c2b3e7eac17.zip chromium_src-52877dbc6c22a02dc7d1dd6f22de2c2b3e7eac17.tar.gz chromium_src-52877dbc6c22a02dc7d1dd6f22de2c2b3e7eac17.tar.bz2 | |
Move tab functions off Browser into browser_tabstrip and browser_tabrestore.
http://crbug.com/133576
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10702029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145015 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager')
| -rw-r--r-- | chrome/browser/task_manager/task_manager_browsertest.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc index 9ec8186..9a50042 100644 --- a/chrome/browser/task_manager/task_manager_browsertest.cc +++ b/chrome/browser/task_manager/task_manager_browsertest.cc @@ -21,6 +21,7 @@ #include "chrome/browser/task_manager/task_manager_browsertest_util.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_navigator.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" @@ -103,9 +104,10 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeTabContentsChanges) { ASSERT_TRUE(StartsWith(model()->GetResourceTitle(2), prefix, true)); // Close the tab and verify that we notice. - WebContents* first_tab = browser()->GetTabContentsAt(0)->web_contents(); + WebContents* first_tab = + chrome::GetTabContentsAt(browser(), 0)->web_contents(); ASSERT_TRUE(first_tab); - browser()->CloseTabContents(first_tab); + chrome::CloseWebContents(browser(), first_tab); TaskManagerBrowserTestUtil::WaitForResourceChange(2); } @@ -394,7 +396,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, // manager is still visible. Make sure we don't crash and the extension // gets reloaded and noticed in the task manager. InfoBarTabHelper* infobar_helper = - browser()->GetActiveTabContents()->infobar_tab_helper(); + chrome::GetActiveTabContents(browser())->infobar_tab_helper(); ASSERT_EQ(1U, infobar_helper->infobar_count()); ConfirmInfoBarDelegate* delegate = infobar_helper-> GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate(); |