chrome/browser/ui/cocoa/constrained_window/constrained_window_alert_unittest.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_alert_unittest.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_alert.mm ('k') | chrome/browser/ui/cocoa/constrained_window/constrained_window_animation.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_alert_unittest.mm

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

index 52f6ca1afa6b60ee91449cc6b47febc063bf2be3..868f81dd15c2d55a6504f3656f93fe5ae4c00e41 100644

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

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

@@ -11,7 +11,7 @@ class ConstrainedWindowAlertTest : public CocoaTest {

// Test showing the alert.

TEST_F(ConstrainedWindowAlertTest, Show) {

- scoped_nsobject<ConstrainedWindowAlert> alert(

+ base::scoped_nsobject<ConstrainedWindowAlert> alert(

[[ConstrainedWindowAlert alloc] init]);

EXPECT_TRUE([alert window]);

EXPECT_TRUE([alert closeButton]);

@@ -27,7 +27,7 @@ TEST_F(ConstrainedWindowAlertTest, Show) {

// Test showing the alert with no buttons.

TEST_F(ConstrainedWindowAlertTest, NoButtons) {

- scoped_nsobject<ConstrainedWindowAlert> alert(

+ base::scoped_nsobject<ConstrainedWindowAlert> alert(

[[ConstrainedWindowAlert alloc] init]);

[alert layout];

[[alert window] makeKeyAndOrderFront:nil];

@@ -35,13 +35,13 @@ TEST_F(ConstrainedWindowAlertTest, NoButtons) {

// Test adding an accessory view to an alert.

TEST_F(ConstrainedWindowAlertTest, AccessoryView) {

- scoped_nsobject<ConstrainedWindowAlert> alert(

+ base::scoped_nsobject<ConstrainedWindowAlert> alert(

[[ConstrainedWindowAlert alloc] init]);

[alert addButtonWithTitle:@"OK" keyEquivalent:@"" target:nil action:NULL];

[alert addButtonWithTitle:@"Cancel" keyEquivalent:@"" target:nil action:NULL];

NSRect view_rect = NSMakeRect(0, 0, 700, 300);

- scoped_nsobject<NSView> view([[NSView alloc] initWithFrame:view_rect]);

+ base::scoped_nsobject<NSView> view([[NSView alloc] initWithFrame:view_rect]);

EXPECT_FALSE([alert accessoryView]);

[alert setAccessoryView:view];

EXPECT_NSEQ([alert accessoryView], view);