Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2028)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/cocoa/autofill/simple_grid_layout_unittest.mm

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanups 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/autofill/autofill_textfield.h ('K') | « chrome/browser/ui/cocoa/autofill/layout_view_unittest.mm ('k') | chrome/browser/ui/cocoa/background_gradient_view_unittest.mm » ('j') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/autofill/simple_grid_layout_unittest.mm
diff --git a/chrome/browser/ui/cocoa/autofill/simple_grid_layout_unittest.mm b/chrome/browser/ui/cocoa/autofill/simple_grid_layout_unittest.mm
index d529211f09290215a6f5bbfe4e15714d5e304f28..da517c7e054393ae87dd4b612da17f289a50aa70 100644
--- a/chrome/browser/ui/cocoa/autofill/simple_grid_layout_unittest.mm
+++ b/chrome/browser/ui/cocoa/autofill/simple_grid_layout_unittest.mm
@@ -5,7 +5,7 @@
#include "chrome/browser/ui/cocoa/autofill/simple_grid_layout.h"
#include "base/logging.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
@@ -19,15 +19,15 @@ class ColumnLayout : public SimpleGridLayout {
class LayoutTest : public testing::Test {
public:
- scoped_nsobject<NSView> CreateViewWithWidth(float width) {
+ base::scoped_nsobject<NSView> CreateViewWithWidth(float width) {
Mark Mentovai 2013/06/24 21:29:48 These two methods should not return scoped_nsobjec
NSRect frame = NSMakeRect(0, 0, width, 0);
- scoped_nsobject<NSView> view([[NSView alloc] initWithFrame:frame]);
+ base::scoped_nsobject<NSView> view([[NSView alloc] initWithFrame:frame]);
return view;
}
- scoped_nsobject<NSView> CreateViewWithHeight(float height) {
+ base::scoped_nsobject<NSView> CreateViewWithHeight(float height) {
NSRect frame = NSMakeRect(0, 0, 0, height);
- scoped_nsobject<NSView> view([[NSView alloc] initWithFrame:frame]);
+ base::scoped_nsobject<NSView> view([[NSView alloc] initWithFrame:frame]);
return view;
}
};
@@ -107,7 +107,7 @@ TEST_F(LayoutTest, AddPaddingRow) {
ColumnSet* cs;
cs = layout.AddRow();
cs->AddColumn(1.0f);
- scoped_nsobject<NSView> view1 = CreateViewWithHeight(30.0f);
+ base::scoped_nsobject<NSView> view1 = CreateViewWithHeight(30.0f);
layout.AddView(view1);
layout.AddPaddingRow(20);
@@ -115,7 +115,7 @@ TEST_F(LayoutTest, AddPaddingRow) {
cs = layout.AddRow();
cs->AddColumn(1.0f);
EXPECT_EQ(3, layout.num_rows());
- scoped_nsobject<NSView> view2 = CreateViewWithHeight(10.0f);
+ base::scoped_nsobject<NSView> view2 = CreateViewWithHeight(10.0f);
layout.AddView(view2);
layout.SizeRowsAndColumns(0.0f);
@@ -132,17 +132,17 @@ TEST_F(LayoutTest, RowsAccomodateHeightOfAllElements) {
layout.GetLastValidColumnSet()->AddColumn(0.6f);
layout.GetLastValidColumnSet()->AddColumn(0.6f);
- scoped_nsobject<NSView> view1 = CreateViewWithHeight(37.0f);
+ base::scoped_nsobject<NSView> view1 = CreateViewWithHeight(37.0f);
layout.AddView(view1);
layout.SizeRowsAndColumns(0.0f);
EXPECT_FLOAT_EQ(37.0f, layout.GetRowHeight(0));
- scoped_nsobject<NSView> view2 = CreateViewWithHeight(26.0f);
+ base::scoped_nsobject<NSView> view2 = CreateViewWithHeight(26.0f);
layout.AddView(view2);
layout.SizeRowsAndColumns(0.0f);
EXPECT_FLOAT_EQ(37.0f, layout.GetRowHeight(0));
- scoped_nsobject<NSView> view3 = CreateViewWithHeight(42.0f);
+ base::scoped_nsobject<NSView> view3 = CreateViewWithHeight(42.0f);
layout.AddView(view3);
layout.SizeRowsAndColumns(0.0f);
EXPECT_FLOAT_EQ(42.0f, layout.GetRowHeight(0));
@@ -153,12 +153,12 @@ TEST_F(LayoutTest, SizeRowsAdjustsRowLocations) {
layout.AddRow();
layout.GetLastValidColumnSet()->AddColumn(0.6f);
- scoped_nsobject<NSView> view1 = CreateViewWithHeight(30.0f);
+ base::scoped_nsobject<NSView> view1 = CreateViewWithHeight(30.0f);
layout.AddView(view1);
layout.AddRow();
layout.GetLastValidColumnSet()->AddColumn(0.6f);
- scoped_nsobject<NSView> view2 = CreateViewWithHeight(40.0f);
+ base::scoped_nsobject<NSView> view2 = CreateViewWithHeight(40.0f);
layout.AddView(view2);
layout.SizeRowsAndColumns(0.0f);
@@ -174,17 +174,17 @@ TEST_F(LayoutTest, SimpleGridLayoutAdjustsViews) {
layout.GetLastValidColumnSet()->AddPaddingColumn(30);
layout.GetLastValidColumnSet()->AddColumn(0.4f);
- scoped_nsobject<NSView> view1 = CreateViewWithHeight(22.0f);
- scoped_nsobject<NSView> view2 = CreateViewWithHeight(20.0f);
+ base::scoped_nsobject<NSView> view1 = CreateViewWithHeight(22.0f);
+ base::scoped_nsobject<NSView> view2 = CreateViewWithHeight(20.0f);
layout.AddView(view1);
layout.AddView(view2);
layout.AddRow();
layout.GetLastValidColumnSet()->AddColumn(0.6f);
- scoped_nsobject<NSView> view3 = CreateViewWithHeight(18.0f);
+ base::scoped_nsobject<NSView> view3 = CreateViewWithHeight(18.0f);
layout.AddView(view3);
- scoped_nsobject<NSView> host_view = CreateViewWithWidth(150.0f);
+ base::scoped_nsobject<NSView> host_view = CreateViewWithWidth(150.0f);
layout.Layout(host_view);
EXPECT_FLOAT_EQ(72.0f, NSWidth([view1 frame]));
@@ -214,7 +214,7 @@ TEST_F(LayoutTest, SimpleGridLayoutHeightForWidth)
layout.AddRow();
layout.GetLastValidColumnSet()->AddColumn(0.6f);
- scoped_nsobject<NSView> view1 = CreateViewWithHeight(22.0f);
+ base::scoped_nsobject<NSView> view1 = CreateViewWithHeight(22.0f);
layout.AddView(view1);
EXPECT_FLOAT_EQ(22.0f, layout.GetPreferredHeightForWidth(100.0));
@@ -223,7 +223,7 @@ TEST_F(LayoutTest, SimpleGridLayoutHeightForWidth)
layout.AddRow();
layout.GetLastValidColumnSet()->AddColumn(0.6f);
- scoped_nsobject<NSView> view2 = CreateViewWithHeight(13.0f);
+ base::scoped_nsobject<NSView> view2 = CreateViewWithHeight(13.0f);
layout.AddView(view2);
EXPECT_FLOAT_EQ(47.0f, layout.GetPreferredHeightForWidth(100.0));
}
@@ -308,7 +308,7 @@ TEST_F(LayoutTest, AddViewSkipsPaddingColumns) {
layout.GetLastValidColumnSet()->AddColumn(0.4f);
EXPECT_EQ(0, layout.next_column());
- scoped_nsobject<NSView> view1 = CreateViewWithWidth(37.0f);
+ base::scoped_nsobject<NSView> view1 = CreateViewWithWidth(37.0f);
layout.AddView(view1);
EXPECT_EQ(2, layout.next_column());
}
@@ -321,12 +321,12 @@ TEST_F(LayoutTest, ColumnLayoutAdjustsViews) {
layout.GetLastValidColumnSet()->AddPaddingColumn(30);
layout.GetLastValidColumnSet()->AddColumn(0.4f);
- scoped_nsobject<NSView> view1 = CreateViewWithWidth(37.0f);
- scoped_nsobject<NSView> view2 = CreateViewWithWidth(42.0f);
+ base::scoped_nsobject<NSView> view1 = CreateViewWithWidth(37.0f);
+ base::scoped_nsobject<NSView> view2 = CreateViewWithWidth(42.0f);
layout.AddView(view1);
layout.AddView(view2);
- scoped_nsobject<NSView> host_view = CreateViewWithWidth(150.0f);
+ base::scoped_nsobject<NSView> host_view = CreateViewWithWidth(150.0f);
layout.Layout(host_view);
EXPECT_FLOAT_EQ(72.0f, NSWidth([view1 frame]));
« chrome/browser/ui/cocoa/autofill/autofill_textfield.h ('K') | « chrome/browser/ui/cocoa/autofill/layout_view_unittest.mm ('k') | chrome/browser/ui/cocoa/background_gradient_view_unittest.mm » ('j') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698