chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_browsertest.mm - Issue 12066003: Remove TabStripModel wrapper use.

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/cocoa/content_settings/collected_cookies_mac_browsertest.mm

Issue 12066003: Remove TabStripModel wrapper use. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: gtk Created 7 years, 11 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/cocoa/browser_window_controller_browsertest.mm ('k') | chrome/browser/ui/cocoa/extensions/extension_action_context_menu_browsertest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_browsertest.mm

diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_browsertest.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_browsertest.mm

index bc89850fd3180472171ec8822c872ed46dd1a2df..3176016a80d56f7e873048b9b014238710abd513 100644

--- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_browsertest.mm

+++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_browsertest.mm

@@ -4,7 +4,8 @@

#import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h"

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

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

+#include "chrome/browser/ui/tabs/tab_strip_model.h"

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

#include "chrome/test/base/in_process_browser_test.h"

#include "content/public/test/test_utils.h"

@@ -12,14 +13,15 @@

typedef InProcessBrowserTest CollectedCookiesMacTest;

IN_PROC_BROWSER_TEST_F(CollectedCookiesMacTest, Close) {

- content::WebContents* web_contents = chrome::GetActiveWebContents(browser());

+ content::WebContents* web_contents =

+ browser()->tab_strip_model()->GetActiveWebContents();

WebContentsModalDialogManager* web_contents_modal_dialog_manager =

WebContentsModalDialogManager::FromWebContents(web_contents);

EXPECT_FALSE(web_contents_modal_dialog_manager->IsShowingDialog());

// Deletes itself.

- CollectedCookiesMac* dialog =

- new CollectedCookiesMac(chrome::GetActiveWebContents(browser()));

+ CollectedCookiesMac* dialog = new CollectedCookiesMac(

+ browser()->tab_strip_model()->GetActiveWebContents());

EXPECT_TRUE(web_contents_modal_dialog_manager->IsShowingDialog());

dialog->PerformClose();

@@ -29,8 +31,8 @@ IN_PROC_BROWSER_TEST_F(CollectedCookiesMacTest, Close) {

IN_PROC_BROWSER_TEST_F(CollectedCookiesMacTest, Outlets) {

// Deletes itself.

- CollectedCookiesMac* dialog =

- new CollectedCookiesMac(chrome::GetActiveWebContents(browser()));

+ CollectedCookiesMac* dialog = new CollectedCookiesMac(

+ browser()->tab_strip_model()->GetActiveWebContents());

CollectedCookiesWindowController* sheet_controller =

dialog->sheet_controller();