chrome/browser/ui/views/constrained_window_views_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/ui/views/constrained_window_views_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/ui/views/browser_actions_container.cc ('k') | chrome/browser/ui/views/find_bar_host_interactive_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/constrained_window_views_browsertest.cc

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

--- chrome/browser/ui/views/constrained_window_views_browsertest.cc (revision 145001)

+++ chrome/browser/ui/views/constrained_window_views_browsertest.cc (working copy)

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

#include "base/memory/weak_ptr.h"

#include "chrome/browser/ui/browser.h"

#include "chrome/browser/ui/browser_commands.h"

+#include "chrome/browser/ui/browser_tabstrip.h"

#include "chrome/browser/ui/constrained_window_tab_helper.h"

#include "chrome/browser/ui/tab_contents/tab_contents.h"

#include "chrome/browser/ui/views/constrained_window_views.h"

@@ -105,7 +106,7 @@

// *) Constrained windows that are queued don't register themselves as

// accelerator targets until they are displayed.

IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, FocusTest) {

- TabContents* tab_contents = browser()->GetActiveTabContents();

+ TabContents* tab_contents = chrome::GetActiveTabContents(browser());

ASSERT_TRUE(tab_contents != NULL);

ConstrainedWindowTabHelper* constrained_window_helper =

tab_contents->constrained_window_tab_helper();

@@ -160,7 +161,7 @@

EXPECT_NE(test_dialog2->GetInitiallyFocusedView(),

focus_manager->GetFocusedView());

- browser()->ActivateTabAt(tab_with_constrained_window, false);

+ chrome::ActivateTabAt(browser(), tab_with_constrained_window, false);

// Activating the previous tab should bring focus to the constrained window.

EXPECT_EQ(test_dialog2->GetInitiallyFocusedView(),