chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm - Issue 17593006: mac: Update clients of scoped_nsobject.h.

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/constrained_window/constrained_window_mac_browsertest.mm

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: iwyu, scoped_nsprotocol Created 7 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

« chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm ('K') | « chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h ('k') | chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.h » ('j') | chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm

diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm

index 6147583613665fa8901ce0090d32e08fd894c862..04bc13a8309ed09be51a282a4e21913fab191b30 100644

--- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm

+++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm

@@ -66,8 +66,8 @@ class ConstrainedWindowMacTest : public InProcessBrowserTest {

}

protected:

- scoped_nsobject<CustomConstrainedWindowSheet> sheet_;

- scoped_nsobject<NSWindow> sheet_window_;

+ base::scoped_nsobject<CustomConstrainedWindowSheet> sheet_;

+ base::scoped_nsobject<NSWindow> sheet_window_;

content::WebContents* tab0_;

content::WebContents* tab1_;

BrowserWindowController* controller_;

@@ -137,7 +137,7 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWindowMacTest, BrowserWindowClose) {

EXPECT_EQ(1.0, [sheet_window_ alphaValue]);

// Close the browser window.

- scoped_nsobject<NSWindow> browser_window(

+ base::scoped_nsobject<NSWindow> browser_window(

[browser()->window()->GetNativeWindow() retain]);

EXPECT_TRUE([browser_window isVisible]);

[browser()->window()->GetNativeWindow() performClose:nil];