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

Unified Diff: chrome/browser/ui/cocoa/autofill/simple_grid_layout.h

Issue 2606293002: Remove ScopedVector from chrome/browser/ui. (Closed)
Patch Set: nits Created 3 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
Index: chrome/browser/ui/cocoa/autofill/simple_grid_layout.h
diff --git a/chrome/browser/ui/cocoa/autofill/simple_grid_layout.h b/chrome/browser/ui/cocoa/autofill/simple_grid_layout.h
index 8e125563c52e840ce7bbc5bbe82c791cc9034ba9..90f6dc891d2d6d0d7cb920c65a396a22bfeb3f57 100644
--- a/chrome/browser/ui/cocoa/autofill/simple_grid_layout.h
+++ b/chrome/browser/ui/cocoa/autofill/simple_grid_layout.h
@@ -8,8 +8,9 @@
#import <Cocoa/Cocoa.h>
#include <memory>
+#include <vector>
-#include "base/memory/scoped_vector.h"
+#include "base/logging.h"
class Column;
class ColumnSet;
@@ -87,15 +88,15 @@ class SimpleGridLayout {
private:
// Adds a new row, updating associated counters and positions.
- void AddRow(Row* row);
+ void AddRow(std::unique_ptr<Row> row);
// Next column in the current ColumnSet.
int next_column_;
int current_auto_id_; // Starting value for autogenerated columnset ids.
- ScopedVector<ViewState> view_states_;
- ScopedVector<ColumnSet> column_sets_;
- ScopedVector<Row> rows_;
+ std::vector<std::unique_ptr<ViewState>> view_states_;
+ std::vector<std::unique_ptr<ColumnSet>> column_sets_;
+ std::vector<std::unique_ptr<Row>> rows_;
NSView* host_;
};
@@ -124,7 +125,7 @@ class ColumnSet {
Column* GetColumn(int column_index) {
DCHECK(column_index >=0 && column_index < num_columns());
- return columns_[column_index];
+ return columns_[column_index].get();
}
// These functions are mostly for testing & deviate from Views Layout class.
@@ -134,7 +135,7 @@ class ColumnSet {
float CalculateRemainingWidth(float width);
void DistributeRemainingWidth(float width);
- ScopedVector<Column> columns_;
+ std::vector<std::unique_ptr<Column>> columns_;
int id_;
};
« no previous file with comments | « chrome/browser/ui/browser_instant_controller_unittest.cc ('k') | chrome/browser/ui/cocoa/autofill/simple_grid_layout.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698