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/browser_keyevents_browsertest.cc | |
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/browser_keyevents_browsertest.cc')
-rw-r--r-- | chrome/browser/browser_keyevents_browsertest.cc | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/chrome/browser/browser_keyevents_browsertest.cc b/chrome/browser/browser_keyevents_browsertest.cc index a9703a0..7f0d3cc 100644 --- a/chrome/browser/browser_keyevents_browsertest.cc +++ b/chrome/browser/browser_keyevents_browsertest.cc @@ -11,6 +11,7 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" #include "chrome/test/base/in_process_browser_test.h" @@ -146,7 +147,7 @@ class BrowserKeyEventsTest : public InProcessBrowserTest { ASSERT_LT(tab_index, browser()->tab_count()); bool actual; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetWebContentsAt(tab_index)->GetRenderViewHost(), + chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(), L"", base::StringPrintf(kSuppressEventJS, type, GetBoolString(!suppress)), &actual)); @@ -172,7 +173,7 @@ class BrowserKeyEventsTest : public InProcessBrowserTest { void GetResultLength(int tab_index, int* length) { ASSERT_LT(tab_index, browser()->tab_count()); ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt( - browser()->GetWebContentsAt(tab_index)->GetRenderViewHost(), + chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(), L"", kGetResultLengthJS, length)); } @@ -184,7 +185,7 @@ class BrowserKeyEventsTest : public InProcessBrowserTest { for (int i = 0; i < actual_length; ++i) { std::string actual; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - browser()->GetWebContentsAt(tab_index)->GetRenderViewHost(), + chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(), L"", base::StringPrintf(kGetResultJS, i), &actual)); // If more events were received than expected, then the additional events @@ -200,7 +201,7 @@ class BrowserKeyEventsTest : public InProcessBrowserTest { ASSERT_LT(tab_index, browser()->tab_count()); std::string actual; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - browser()->GetWebContentsAt(tab_index)->GetRenderViewHost(), + chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(), L"", kGetFocusedElementJS, &actual)); ASSERT_EQ(WideToUTF8(focused), actual); } @@ -209,7 +210,7 @@ class BrowserKeyEventsTest : public InProcessBrowserTest { ASSERT_LT(tab_index, browser()->tab_count()); bool actual; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetWebContentsAt(tab_index)->GetRenderViewHost(), + chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(), L"", base::StringPrintf(kSetFocusedElementJS, focused), &actual)); @@ -221,7 +222,7 @@ class BrowserKeyEventsTest : public InProcessBrowserTest { ASSERT_LT(tab_index, browser()->tab_count()); std::string actual; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - browser()->GetWebContentsAt(tab_index)->GetRenderViewHost(), + chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(), L"", base::StringPrintf(kGetTextBoxValueJS, id), &actual)); @@ -233,7 +234,7 @@ class BrowserKeyEventsTest : public InProcessBrowserTest { ASSERT_LT(tab_index, browser()->tab_count()); std::string actual; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - browser()->GetWebContentsAt(tab_index)->GetRenderViewHost(), + chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(), L"", base::StringPrintf(kSetTextBoxValueJS, id, value), &actual)); @@ -244,7 +245,7 @@ class BrowserKeyEventsTest : public InProcessBrowserTest { ASSERT_LT(tab_index, browser()->tab_count()); bool actual; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetWebContentsAt(tab_index)->GetRenderViewHost(), + chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(), L"", base::StringPrintf(kStartTestJS, result_length), &actual)); ASSERT_TRUE(actual); } @@ -264,7 +265,7 @@ class BrowserKeyEventsTest : public InProcessBrowserTest { // because the test finished message might be arrived before returning // from the SendKeyPressSync() method. TestFinishObserver finish_observer( - browser()->GetWebContentsAt(tab_index)->GetRenderViewHost()); + chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost()); ASSERT_TRUE(ui_test_utils::SendKeyPressSync( browser(), test.key, test.ctrl, test.shift, test.alt, test.command)); @@ -737,7 +738,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_ReservedAccelerators) { ui_test_utils::WindowedNotificationObserver wait_for_tab_closed( content::NOTIFICATION_WEB_CONTENTS_DESTROYED, - content::Source<content::WebContents>(browser()->GetWebContentsAt(1))); + content::Source<content::WebContents>(chrome::GetWebContentsAt(browser(), 1))); // Press Ctrl/Cmd+W, which will close the tab. #if defined(OS_MACOSX) |