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/accessibility | |
| 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/accessibility')
| -rw-r--r-- | chrome/browser/accessibility/accessibility_extension_apitest.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/accessibility/accessibility_win_browsertest.cc | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/accessibility/accessibility_extension_apitest.cc b/chrome/browser/accessibility/accessibility_extension_apitest.cc index 158e58a..0dc9aba 100644 --- a/chrome/browser/accessibility/accessibility_extension_apitest.cc +++ b/chrome/browser/accessibility/accessibility_extension_apitest.cc @@ -7,11 +7,12 @@ #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/tab_contents/simple_alert_infobar_delegate.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/chrome_switches.h" IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetAlertsForTab) { - TabContents* tab = browser()->GetActiveTabContents(); + TabContents* tab = chrome::GetActiveTabContents(browser()); ASSERT_TRUE(tab); InfoBarTabHelper* infobar_helper = tab->infobar_tab_helper(); diff --git a/chrome/browser/accessibility/accessibility_win_browsertest.cc b/chrome/browser/accessibility/accessibility_win_browsertest.cc index c7a9720..ab4bbe8 100644 --- a/chrome/browser/accessibility/accessibility_win_browsertest.cc +++ b/chrome/browser/accessibility/accessibility_win_browsertest.cc @@ -10,6 +10,7 @@ #include "base/utf_string_conversions.h" #include "base/win/scoped_comptr.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" @@ -210,10 +211,10 @@ void RecursiveFindNodeInAccessibilityTree( IAccessible* AccessibilityWinBrowserTest::GetRendererAccessible() { content::RenderViewHostTester::EnableAccessibilityUpdatedNotifications( - browser()->GetActiveWebContents()->GetRenderViewHost()); + chrome::GetActiveWebContents(browser())->GetRenderViewHost()); HWND hwnd_render_widget_host_view = - browser()->GetActiveWebContents()->GetRenderWidgetHostView()-> + chrome::GetActiveWebContents(browser())->GetRenderWidgetHostView()-> GetNativeView(); // Invoke windows screen reader detection by sending the WM_GETOBJECT message @@ -233,7 +234,7 @@ AccessibilityWinBrowserTest::GetRendererAccessible() { } void AccessibilityWinBrowserTest::ExecuteScript(wstring script) { - browser()->GetActiveWebContents()->GetRenderViewHost()-> + chrome::GetActiveWebContents(browser())->GetRenderViewHost()-> ExecuteJavascriptInWebFrame(L"", script); } |