diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-03 05:53:20 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-03 05:53:20 +0000 |
| commit | 4ca153033f022dc6e11d6094daed41b1ed0a995f (patch) | |
| tree | f4720517b10953166f84707ca3ec8b82de860884 /chrome/browser/speech | |
| parent | 08bd3d71d969061b1588e6a4210f6d74b0ec0c6d (diff) | |
| download | chromium_src-4ca153033f022dc6e11d6094daed41b1ed0a995f.zip chromium_src-4ca153033f022dc6e11d6094daed41b1ed0a995f.tar.gz chromium_src-4ca153033f022dc6e11d6094daed41b1ed0a995f.tar.bz2 | |
Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've converted the easy ones, I'll do the ones with more dependencies in a separate change to keep things trivial to review.
I considered taking out GetSelectedTabContents altogether and having people just use GetSelectedTabContentsWrapper()->web_contents() per the existing comment in browser.h, but there are a lot of callers and it seemed too long to type.
BUG=98716
TBR=joi
Review URL: http://codereview.chromium.org/9015022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116122 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/speech')
| -rw-r--r-- | chrome/browser/speech/speech_input_bubble_browsertest.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/chrome/browser/speech/speech_input_bubble_browsertest.cc b/chrome/browser/speech/speech_input_bubble_browsertest.cc index 6abd94a..72fbf3a 100644 --- a/chrome/browser/speech/speech_input_bubble_browsertest.cc +++ b/chrome/browser/speech/speech_input_bubble_browsertest.cc @@ -23,16 +23,14 @@ class SpeechInputBubbleTest : public SpeechInputBubbleDelegate, IN_PROC_BROWSER_TEST_F(SpeechInputBubbleTest, CreateAndDestroy) { gfx::Rect element_rect(100, 100, 100, 100); scoped_ptr<SpeechInputBubble> bubble(SpeechInputBubble::Create( - browser()->GetSelectedTabContentsWrapper()->web_contents(), this, - element_rect)); + browser()->GetSelectedWebContents(), this, element_rect)); EXPECT_TRUE(bubble.get()); } IN_PROC_BROWSER_TEST_F(SpeechInputBubbleTest, ShowAndDestroy) { gfx::Rect element_rect(100, 100, 100, 100); scoped_ptr<SpeechInputBubble> bubble(SpeechInputBubble::Create( - browser()->GetSelectedTabContentsWrapper()->web_contents(), this, - element_rect)); + browser()->GetSelectedWebContents(), this, element_rect)); EXPECT_TRUE(bubble.get()); bubble->Show(); } @@ -40,8 +38,7 @@ IN_PROC_BROWSER_TEST_F(SpeechInputBubbleTest, ShowAndDestroy) { IN_PROC_BROWSER_TEST_F(SpeechInputBubbleTest, ShowAndHide) { gfx::Rect element_rect(100, 100, 100, 100); scoped_ptr<SpeechInputBubble> bubble(SpeechInputBubble::Create( - browser()->GetSelectedTabContentsWrapper()->web_contents(), this, - element_rect)); + browser()->GetSelectedWebContents(), this, element_rect)); EXPECT_TRUE(bubble.get()); bubble->Show(); bubble->Hide(); @@ -50,8 +47,7 @@ IN_PROC_BROWSER_TEST_F(SpeechInputBubbleTest, ShowAndHide) { IN_PROC_BROWSER_TEST_F(SpeechInputBubbleTest, ShowAndHideTwice) { gfx::Rect element_rect(100, 100, 100, 100); scoped_ptr<SpeechInputBubble> bubble(SpeechInputBubble::Create( - browser()->GetSelectedTabContentsWrapper()->web_contents(), this, - element_rect)); + browser()->GetSelectedWebContents(), this, element_rect)); EXPECT_TRUE(bubble.get()); bubble->Show(); bubble->Hide(); |