chrome/browser/speech/speech_recognition_bubble_browsertest.cc - Issue 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/speech/speech_recognition_bubble_browsertest.cc

Issue 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/sessions/session_service.cc ('k') | chrome/browser/speech/speech_recognition_bubble_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/speech/speech_recognition_bubble_browsertest.cc

===================================================================

--- chrome/browser/speech/speech_recognition_bubble_browsertest.cc (revision 145001)

+++ chrome/browser/speech/speech_recognition_bubble_browsertest.cc (working copy)

@@ -5,6 +5,7 @@

#include "base/memory/scoped_ptr.h"

#include "chrome/browser/speech/speech_recognition_bubble.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/test/base/in_process_browser_test.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -24,14 +25,14 @@

IN_PROC_BROWSER_TEST_F(SpeechRecognitionBubbleTest, CreateAndDestroy) {

gfx::Rect element_rect(100, 100, 100, 100);

scoped_ptr<SpeechRecognitionBubble> bubble(SpeechRecognitionBubble::Create(

- browser()->GetActiveWebContents(), this, element_rect));

+ chrome::GetActiveWebContents(browser()), this, element_rect));

EXPECT_TRUE(bubble.get());

}

IN_PROC_BROWSER_TEST_F(SpeechRecognitionBubbleTest, ShowAndDestroy) {

gfx::Rect element_rect(100, 100, 100, 100);

scoped_ptr<SpeechRecognitionBubble> bubble(SpeechRecognitionBubble::Create(

- browser()->GetActiveWebContents(), this, element_rect));

+ chrome::GetActiveWebContents(browser()), this, element_rect));

EXPECT_TRUE(bubble.get());

bubble->Show();

}

@@ -39,7 +40,7 @@

IN_PROC_BROWSER_TEST_F(SpeechRecognitionBubbleTest, ShowAndHide) {

gfx::Rect element_rect(100, 100, 100, 100);

scoped_ptr<SpeechRecognitionBubble> bubble(SpeechRecognitionBubble::Create(

- browser()->GetActiveWebContents(), this, element_rect));

+ chrome::GetActiveWebContents(browser()), this, element_rect));

EXPECT_TRUE(bubble.get());

bubble->Show();

bubble->Hide();

@@ -48,7 +49,7 @@

IN_PROC_BROWSER_TEST_F(SpeechRecognitionBubbleTest, ShowAndHideTwice) {

gfx::Rect element_rect(100, 100, 100, 100);

scoped_ptr<SpeechRecognitionBubble> bubble(SpeechRecognitionBubble::Create(

- browser()->GetActiveWebContents(), this, element_rect));

+ chrome::GetActiveWebContents(browser()), this, element_rect));

EXPECT_TRUE(bubble.get());

bubble->Show();

bubble->Hide();