Remove GridLayout::CreateAndInstall
Replace with calls to SetLayoutManager(make_unique...); This is for consistency with other layout manager types now that we have a safer scoped_ptr way to set the layout manager. GridLayout's members have been updated to use C++11 initialization. Change-Id: Ief98beea9e473cec1550642c4d2b6e8d40c9e14f Reviewed-on: https://chromium-review.googlesource.com/830675 Commit-Queue: Brett Wilson <brettw@chromium.org> Reviewed-by: Scott Violet <sky@chromium.org> Cr-Commit-Position: refs/heads/master@{#524536}
This commit is contained in:
ash
login
message_center
session
shell
system
chrome/browser
chromeos
ui
views
accessibility
apps
app_info_dialog
bookmarks
certificate_selector.cccollected_cookies_views.ccconfirm_bubble_views.cccontent_setting_bubble_contents.cccookie_info_view.cccreate_application_shortcut_view.cccrypto_module_password_dialog_view.ccdesktop_ios_promotion
download
extensions
first_run_bubble.ccfirst_run_dialog.ccglobal_error_bubble_view.ccharmony
hover_button.cchung_renderer_view.ccime
intent_picker_bubble_view.cclogin_view.ccpage_info
passwords
payments
credit_card_editor_view_controller.cccvc_unmask_view_controller.cceditor_view_controller.ccorder_summary_view_controller.ccpayment_request_dialog_view.ccpayment_request_item_list.ccpayment_request_sheet_controller.ccpayment_request_views_util.ccpayment_sheet_view_controller.cc
profiles
proximity_auth
sad_tab_view.ccsession_crashed_bubble_view.ccsync
translate
try_chrome_dialog_win
uninstall_view.cccontent/shell/browser
mash
ui
app_list
views
color_chooser
controls
examples
button_sticker_sheet.ccdialog_example.ccexamples_window.cclabel_example.ccmessage_box_example.ccmultiline_example.ccprogress_bar_example.ccradio_button_example.ccscroll_view_example.cctabbed_pane_example.cctable_example.cctext_example.cctextfield_example.cctree_view_example.cc
layout
window
@@ -145,7 +145,8 @@ LoginAuthUserView::LoginAuthUserView(
|
||||
|
||||
// Use views::GridLayout instead of views::BoxLayout because views::BoxLayout
|
||||
// lays out children according to the view->children order.
|
||||
views::GridLayout* grid_layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* grid_layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
views::ColumnSet* column_set = grid_layout->AddColumnSet(0);
|
||||
column_set->AddColumn(views::GridLayout::CENTER, views::GridLayout::LEADING,
|
||||
0 /*resize_percent*/, views::GridLayout::USE_PREF,
|
||||
|
@@ -484,7 +484,8 @@ void LoginUserView::SetLargeLayout() {
|
||||
|
||||
// Use views::GridLayout instead of views::BoxLayout because views::BoxLayout
|
||||
// lays out children according to the view->children order.
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
|
||||
constexpr int kImageColumnId = 0;
|
||||
constexpr int kLabelDropdownColumnId = 1;
|
||||
|
@@ -417,7 +417,7 @@ void NotifierSettingsView::NotifierButton::GridChanged() {
|
||||
using views::ColumnSet;
|
||||
using views::GridLayout;
|
||||
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(this);
|
||||
GridLayout* layout = SetLayoutManager(std::make_unique<GridLayout>(this));
|
||||
ColumnSet* cs = layout->AddColumnSet(0);
|
||||
// Add a column for the checkbox.
|
||||
cs->AddPaddingColumn(0, kInnateCheckboxRightPadding);
|
||||
|
@@ -81,7 +81,8 @@ void SessionAbortedDialog::InitDialog(const std::string& user_email) {
|
||||
constexpr int kTopInset = 10;
|
||||
constexpr int kOtherInset = 40;
|
||||
// Create the views and layout manager and set them up.
|
||||
views::GridLayout* grid_layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* grid_layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
SetBorder(views::CreateEmptyBorder(kTopInset, kOtherInset, kOtherInset,
|
||||
kOtherInset));
|
||||
|
||||
|
@@ -210,7 +210,8 @@ WindowTypeLauncher::WindowTypeLauncher(
|
||||
this,
|
||||
base::ASCIIToUTF16("Show a web/app notification"))),
|
||||
show_views_examples_callback_(show_views_examples_callback) {
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
SetBorder(views::CreateEmptyBorder(gfx::Insets(5)));
|
||||
views::ColumnSet* column_set = layout->AddColumnSet(0);
|
||||
column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER,
|
||||
|
@@ -262,7 +262,8 @@ void TimeView::UpdateClockLayout(ClockLayout clock_layout) {
|
||||
AddChildView(horizontal_label_.get());
|
||||
} else {
|
||||
RemoveChildView(horizontal_label_.get());
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
const int kColumnId = 0;
|
||||
views::ColumnSet* columns = layout->AddColumnSet(kColumnId);
|
||||
columns->AddPaddingColumn(0, kVerticalClockLeftPadding);
|
||||
|
@@ -131,7 +131,8 @@ void StatusAreaWidgetDelegate::AddTray(views::View* tray) {
|
||||
void StatusAreaWidgetDelegate::UpdateLayout() {
|
||||
// Use a grid layout so that the trays can be centered in each cell, and
|
||||
// so that the widget gets laid out correctly when tray sizes change.
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
|
||||
// Update tray border based on layout.
|
||||
bool is_child_on_edge = true;
|
||||
|
@@ -165,7 +165,8 @@ void EnrollmentDialogView::InitDialog() {
|
||||
label->SetMultiLine(true);
|
||||
label->SetAllowCharacterBreak(true);
|
||||
|
||||
views::GridLayout* grid_layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* grid_layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
|
||||
views::ColumnSet* columns = grid_layout->AddColumnSet(0);
|
||||
columns->AddColumn(views::GridLayout::FILL, // Horizontal resize.
|
||||
|
@@ -67,7 +67,7 @@ class ToolbarRowView : public views::View {
|
||||
views::View* forward,
|
||||
views::View* reload,
|
||||
views::View* location_bar) {
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(this);
|
||||
GridLayout* layout = SetLayoutManager(std::make_unique<GridLayout>(this));
|
||||
|
||||
const int related_horizontal_spacing =
|
||||
ChromeLayoutProvider::Get()->GetDistanceMetric(
|
||||
@@ -204,7 +204,7 @@ void SimpleWebViewDialog::Init() {
|
||||
toolbar_row->Init(back_, forward_, reload_, location_bar_);
|
||||
|
||||
// Layout.
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(this);
|
||||
GridLayout* layout = SetLayoutManager(std::make_unique<GridLayout>(this));
|
||||
|
||||
views::ColumnSet* column_set = layout->AddColumnSet(0);
|
||||
column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
|
||||
|
@@ -506,7 +506,8 @@ void VPNConfigView::Init() {
|
||||
DCHECK(vpn && vpn->type() == shill::kTypeVPN);
|
||||
}
|
||||
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
|
||||
// Observer any changes to the certificate list.
|
||||
CertLibrary::Get()->AddObserver(this);
|
||||
|
@@ -943,7 +943,8 @@ void WifiConfigView::Init(bool show_8021x) {
|
||||
ParseUIProperty(&passphrase_ui_data_, network, ::onc::wifi::kPassphrase);
|
||||
}
|
||||
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
|
||||
const int column_view_set_id = 0;
|
||||
views::ColumnSet* column_set = layout->AddColumnSet(column_view_set_id);
|
||||
|
@@ -212,7 +212,8 @@ void WimaxConfigView::Init() {
|
||||
WifiConfigView::ParseUIProperty(
|
||||
&passphrase_ui_data_, wimax, ::onc::wifi::kPassphrase);
|
||||
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
|
||||
const int column_view_set_id = 0;
|
||||
views::ColumnSet* column_set = layout->AddColumnSet(column_view_set_id);
|
||||
|
@@ -164,7 +164,8 @@ void RequestPinView::Init() {
|
||||
set_margins(ChromeLayoutProvider::Get()->GetDialogInsetsForContentType(
|
||||
views::TEXT, views::TEXT));
|
||||
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
|
||||
int column_view_set_id = 0;
|
||||
views::ColumnSet* column_set = layout->AddColumnSet(column_view_set_id);
|
||||
|
@@ -113,7 +113,8 @@ void InvertBubbleView::Init() {
|
||||
close_->SetFontList(original_font_list);
|
||||
close_->set_listener(this);
|
||||
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
|
||||
views::ColumnSet* columns = layout->AddColumnSet(0);
|
||||
for (int i = 0; i < 4; i++) {
|
||||
|
@@ -90,7 +90,7 @@ class RevokeButton : public views::ImageButton, public views::ButtonListener {
|
||||
class BulletedPermissionsList : public views::View {
|
||||
public:
|
||||
BulletedPermissionsList() {
|
||||
layout_ = views::GridLayout::CreateAndInstall(this);
|
||||
layout_ = SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
|
||||
// Create 3 columns: the bullet, the bullet text, and the revoke button.
|
||||
views::ColumnSet* column_set = layout_->AddColumnSet(kBulletColumnSetId);
|
||||
|
@@ -277,7 +277,8 @@ void BookmarkBubbleView::Init() {
|
||||
|
||||
SetLayoutManager(std::make_unique<views::FillLayout>());
|
||||
bookmark_contents_view_ = new views::View();
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(bookmark_contents_view_);
|
||||
GridLayout* layout = bookmark_contents_view_->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(bookmark_contents_view_));
|
||||
|
||||
constexpr int kColumnId = 0;
|
||||
ConfigureTextfieldStack(layout, kColumnId);
|
||||
|
@@ -336,7 +336,8 @@ void BookmarkEditorView::Init() {
|
||||
new_folder_button_->SetEnabled(false);
|
||||
}
|
||||
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(this);
|
||||
GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
|
||||
|
||||
const int labels_column_set_id = 0;
|
||||
|
@@ -200,7 +200,8 @@ void CertificateSelector::Show() {
|
||||
|
||||
void CertificateSelector::InitWithText(
|
||||
std::unique_ptr<views::View> text_label) {
|
||||
views::GridLayout* const layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* const layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
|
||||
const int kColumnSetId = 0;
|
||||
views::ColumnSet* const column_set = layout->AddColumnSet(kColumnSetId);
|
||||
|
@@ -397,7 +397,8 @@ CollectedCookiesViews::~CollectedCookiesViews() {
|
||||
void CollectedCookiesViews::Init() {
|
||||
using views::GridLayout;
|
||||
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(this);
|
||||
GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
|
||||
if (provider->UseExtraDialogPadding()) {
|
||||
SetBorder(
|
||||
@@ -472,7 +473,9 @@ views::View* CollectedCookiesViews::CreateAllowedPane() {
|
||||
using views::GridLayout;
|
||||
|
||||
views::View* pane = new views::View();
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(pane);
|
||||
GridLayout* layout =
|
||||
pane->SetLayoutManager(std::make_unique<views::GridLayout>(pane));
|
||||
|
||||
pane->SetBorder(
|
||||
views::CreateEmptyBorder(ChromeLayoutProvider::Get()->GetInsetsMetric(
|
||||
views::INSETS_DIALOG_SUBSECTION)));
|
||||
@@ -535,7 +538,8 @@ views::View* CollectedCookiesViews::CreateBlockedPane() {
|
||||
using views::GridLayout;
|
||||
|
||||
views::View* pane = new views::View();
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(pane);
|
||||
GridLayout* layout =
|
||||
pane->SetLayoutManager(std::make_unique<views::GridLayout>(pane));
|
||||
pane->SetBorder(
|
||||
views::CreateEmptyBorder(ChromeLayoutProvider::Get()->GetInsetsMetric(
|
||||
views::INSETS_DIALOG_SUBSECTION)));
|
||||
@@ -567,8 +571,8 @@ std::unique_ptr<views::View> CollectedCookiesViews::CreateButtonsPane() {
|
||||
|
||||
{
|
||||
auto allowed = std::make_unique<views::View>();
|
||||
views::GridLayout* layout =
|
||||
views::GridLayout::CreateAndInstall(allowed.get());
|
||||
views::GridLayout* layout = allowed->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(allowed.get()));
|
||||
|
||||
block_allowed_button_ = views::MdTextButton::CreateSecondaryUiButton(
|
||||
this, l10n_util::GetStringUTF16(IDS_COLLECTED_COOKIES_BLOCK_BUTTON));
|
||||
@@ -584,8 +588,8 @@ std::unique_ptr<views::View> CollectedCookiesViews::CreateButtonsPane() {
|
||||
|
||||
{
|
||||
auto blocked = std::make_unique<views::View>();
|
||||
views::GridLayout* layout =
|
||||
views::GridLayout::CreateAndInstall(blocked.get());
|
||||
views::GridLayout* layout = blocked->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(blocked.get()));
|
||||
blocked->SetVisible(false);
|
||||
|
||||
allow_blocked_button_ = views::MdTextButton::CreateSecondaryUiButton(
|
||||
|
@@ -22,7 +22,8 @@ ConfirmBubbleViews::ConfirmBubbleViews(
|
||||
: model_(std::move(model)), link_(NULL) {
|
||||
set_margins(ChromeLayoutProvider::Get()->GetDialogInsetsForContentType(
|
||||
views::TEXT, views::TEXT));
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
|
||||
// Use a fixed maximum message width, so longer messages will wrap.
|
||||
const int kMaxMessageWidth = 400;
|
||||
|
@@ -252,7 +252,8 @@ int ContentSettingBubbleContents::ListItemContainer::GetRowIndexOf(
|
||||
|
||||
void ContentSettingBubbleContents::ListItemContainer::ResetLayout() {
|
||||
using views::GridLayout;
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(this);
|
||||
GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
views::ColumnSet* item_list_column_set = layout->AddColumnSet(0);
|
||||
item_list_column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 0,
|
||||
GridLayout::USE_PREF, 0, 0);
|
||||
@@ -377,7 +378,8 @@ bool ContentSettingBubbleContents::ShouldShowCloseButton() const {
|
||||
void ContentSettingBubbleContents::Init() {
|
||||
using views::GridLayout;
|
||||
|
||||
GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
const ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
|
||||
const int related_control_horizontal_spacing =
|
||||
provider->GetDistanceMetric(views::DISTANCE_RELATED_CONTROL_HORIZONTAL);
|
||||
|
@@ -148,7 +148,8 @@ void CookieInfoView::Init() {
|
||||
l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_EXPIRES_LABEL));
|
||||
expires_value_field_ = new views::Textfield;
|
||||
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
|
||||
const gfx::Insets& dialog_insets =
|
||||
provider->GetInsetsMetric(views::INSETS_DIALOG);
|
||||
|
@@ -106,7 +106,8 @@ void CreateChromeApplicationShortcutView::InitControls() {
|
||||
ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
|
||||
|
||||
// Layout controls
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
|
||||
static const int kHeaderColumnSetId = 0;
|
||||
views::ColumnSet* column_set = layout->AddColumnSet(kHeaderColumnSetId);
|
||||
|
@@ -125,7 +125,8 @@ void CryptoModulePasswordDialogView::Init(const std::string& hostname,
|
||||
|
||||
ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
|
||||
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
|
||||
views::ColumnSet* reason_column_set = layout->AddColumnSet(0);
|
||||
reason_column_set->AddColumn(
|
||||
|
@@ -40,7 +40,8 @@ DesktopIOSPromotionBubbleView::DesktopIOSPromotionBubbleView(
|
||||
base::MakeUnique<DesktopIOSPromotionBubbleController>(profile,
|
||||
this,
|
||||
entry_point)) {
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
|
||||
SetBorder(views::CreateEmptyBorder(
|
||||
0,
|
||||
|
@@ -98,8 +98,8 @@ DownloadDangerPromptViews::DownloadDangerPromptViews(
|
||||
|
||||
set_margins(ChromeLayoutProvider::Get()->GetDialogInsetsForContentType(
|
||||
views::TEXT, views::TEXT));
|
||||
views::GridLayout* layout =
|
||||
views::GridLayout::CreateAndInstall(contents_view_);
|
||||
views::GridLayout* layout = contents_view_->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(contents_view_));
|
||||
|
||||
views::ColumnSet* column_set = layout->AddColumnSet(0);
|
||||
column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
|
||||
|
@@ -43,7 +43,8 @@ BookmarkAppConfirmationView::BookmarkAppConfirmationView(
|
||||
const ChromeLayoutProvider* layout_provider = ChromeLayoutProvider::Get();
|
||||
set_margins(layout_provider->GetDialogInsetsForContentType(views::CONTROL,
|
||||
views::CONTROL));
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
constexpr int kColumnSetId = 0;
|
||||
|
||||
views::ColumnSet* column_set = layout->AddColumnSet(kColumnSetId);
|
||||
|
@@ -222,7 +222,8 @@ class CustomScrollableView : public views::View {
|
||||
} // namespace
|
||||
|
||||
BulletedView::BulletedView(views::View* view) {
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
views::ColumnSet* column_set = layout->AddColumnSet(0);
|
||||
column_set->AddColumn(views::GridLayout::CENTER, views::GridLayout::LEADING,
|
||||
0, views::GridLayout::FIXED, kBulletWidth, 0);
|
||||
@@ -347,8 +348,8 @@ void ExtensionInstallDialogView::InitView() {
|
||||
// Create the scrollable view which will contain the permissions and retained
|
||||
// files/devices. It will span the full content width.
|
||||
CustomScrollableView* scrollable = new CustomScrollableView();
|
||||
views::GridLayout* scroll_layout =
|
||||
views::GridLayout::CreateAndInstall(scrollable);
|
||||
views::GridLayout* scroll_layout = scrollable->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(scrollable));
|
||||
|
||||
views::ColumnSet* scrollable_column_set =
|
||||
scroll_layout->AddColumnSet(column_set_id);
|
||||
@@ -518,7 +519,8 @@ views::GridLayout* ExtensionInstallDialogView::CreateLayout(
|
||||
// extension icon can be shown on the right of the dialog title, but on the
|
||||
// same y-axis, and the scroll view used to contain other content can have its
|
||||
// scrollbar aligned with the right edge of the dialog.
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(container_);
|
||||
views::GridLayout* layout = container_->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(container_));
|
||||
container_->SetBorder(views::CreateEmptyBorder(0, content_insets.left(),
|
||||
content_insets.bottom(), 0));
|
||||
AddChildView(container_);
|
||||
@@ -729,7 +731,8 @@ ExpandableContainerView::ExpandableContainerView(
|
||||
expanded_(false) {
|
||||
DCHECK(!details.empty());
|
||||
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
constexpr int kColumnSetId = 0;
|
||||
views::ColumnSet* column_set = layout->AddColumnSet(kColumnSetId);
|
||||
|
||||
|
@@ -103,7 +103,8 @@ void MediaGalleriesDialogViews::InitChildViews() {
|
||||
|
||||
const int dialog_content_width = views::Widget::GetLocalizedContentsWidth(
|
||||
IDS_MEDIA_GALLERIES_DIALOG_CONTENT_WIDTH_CHARS);
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(contents_);
|
||||
views::GridLayout* layout = contents_->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(contents_));
|
||||
|
||||
int column_set_id = 0;
|
||||
views::ColumnSet* columns = layout->AddColumnSet(column_set_id);
|
||||
|
@@ -70,7 +70,8 @@ void FirstRunBubble::Init() {
|
||||
views::Label* subtext = new views::Label(
|
||||
l10n_util::GetStringUTF16(IDS_FR_BUBBLE_SUBTEXT), {original_font_list});
|
||||
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
|
||||
ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
|
||||
|
||||
|
@@ -72,7 +72,8 @@ FirstRunDialog::FirstRunDialog(Profile* profile)
|
||||
report_crashes_(NULL) {
|
||||
set_margins(ChromeLayoutProvider::Get()->GetDialogInsetsForContentType(
|
||||
views::CONTROL, views::CONTROL));
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(this);
|
||||
GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
|
||||
views::ColumnSet* column_set = layout->AddColumnSet(0);
|
||||
column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 0,
|
||||
|
@@ -116,7 +116,8 @@ void GlobalErrorBubbleView::Init() {
|
||||
message_labels.push_back(message_label);
|
||||
}
|
||||
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
|
||||
// First row, message labels.
|
||||
views::ColumnSet* cs = layout->AddColumnSet(0);
|
||||
|
@@ -52,7 +52,8 @@ BulletedLabelListView::BulletedLabelListView(
|
||||
constexpr auto USE_PREF = views::GridLayout::USE_PREF;
|
||||
constexpr auto FIXED = views::GridLayout::FIXED;
|
||||
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
views::ColumnSet* columns = layout->AddColumnSet(kColumnSetId);
|
||||
|
||||
int width = ChromeLayoutProvider::Get()->GetDistanceMetric(
|
||||
|
@@ -120,7 +120,8 @@ HoverButton::HoverButton(views::ButtonListener* button_listener,
|
||||
|
||||
SetBorder(CreateBorderWithVerticalSpacing(remaining_vert_spacing));
|
||||
|
||||
views::GridLayout* grid_layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* grid_layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
// Badging may make the icon slightly wider (but not taller). However, the
|
||||
// layout should be the same whether or not the icon is badged, so allow the
|
||||
// badged part of the icon to extend into the padding.
|
||||
|
@@ -448,7 +448,8 @@ void HungRendererDialogView::Init() {
|
||||
|
||||
using views::GridLayout;
|
||||
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(this);
|
||||
GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
|
||||
|
||||
constexpr int kColumnSetId = 0;
|
||||
|
@@ -159,7 +159,8 @@ void ImeWarningBubbleView::InitLayout() {
|
||||
// -----------------------------------------
|
||||
//
|
||||
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
|
||||
int cs_id = 0;
|
||||
|
||||
|
@@ -211,7 +211,8 @@ bool IntentPickerBubbleView::ShouldShowCloseButton() const {
|
||||
}
|
||||
|
||||
void IntentPickerBubbleView::Init() {
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
|
||||
// Creates a view to hold the views for each app.
|
||||
views::View* scrollable_view = new views::View();
|
||||
|
@@ -53,7 +53,8 @@ LoginView::LoginView(const base::string16& authority,
|
||||
provider->GetDialogInsetsForContentType(views::TEXT, views::CONTROL)));
|
||||
|
||||
// Initialize the Grid Layout Manager used for this dialog box.
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(this);
|
||||
GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
views::ColumnSet* column_set = layout->AddColumnSet(kHeaderColumnSetId);
|
||||
column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, kStretchy,
|
||||
GridLayout::FIXED, kMessageWidth, 0);
|
||||
|
@@ -31,7 +31,8 @@ ChosenObjectView::ChosenObjectView(
|
||||
|
||||
constexpr float kFixed = 0.f;
|
||||
constexpr float kStretchy = 1.f;
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
const int column_set_id = 0;
|
||||
views::ColumnSet* column_set = layout->AddColumnSet(column_set_id);
|
||||
column_set->AddColumn(views::GridLayout::CENTER, views::GridLayout::CENTER,
|
||||
|
@@ -122,7 +122,8 @@ views::View* CreateMoreInfoLinkSection(views::LinkListener* listener,
|
||||
(*link)->SetTooltipText(tooltip_text);
|
||||
|
||||
views::View* new_view = new views::View();
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(new_view);
|
||||
GridLayout* layout =
|
||||
new_view->SetLayoutManager(std::make_unique<views::GridLayout>(new_view));
|
||||
ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
|
||||
const int side_margin =
|
||||
provider->GetInsetsMetric(views::INSETS_DIALOG_SUBSECTION).left();
|
||||
@@ -312,7 +313,8 @@ BubbleHeaderView::BubbleHeaderView(
|
||||
password_reuse_button_container_(nullptr),
|
||||
change_password_button_(nullptr),
|
||||
whitelist_password_reuse_button_(nullptr) {
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(this);
|
||||
GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
|
||||
const int label_column_status = 1;
|
||||
AddColumnWithSideMargin(layout, side_margin, label_column_status);
|
||||
@@ -573,7 +575,8 @@ PageInfoBubbleView::PageInfoBubbleView(
|
||||
UseHarmonyStyle() ? hover_list_spacing : margins().bottom();
|
||||
set_margins(gfx::Insets(margins().top(), 0, bottom_margin, 0));
|
||||
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(this);
|
||||
GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
constexpr int kColumnId = 0;
|
||||
views::ColumnSet* column_set = layout->AddColumnSet(kColumnId);
|
||||
column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
|
||||
@@ -756,7 +759,8 @@ void PageInfoBubbleView::SetPermissionInfo(
|
||||
if (permissions_view_->has_children())
|
||||
return;
|
||||
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(permissions_view_);
|
||||
GridLayout* layout = permissions_view_->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(permissions_view_));
|
||||
|
||||
ChromeLayoutProvider* layout_provider = ChromeLayoutProvider::Get();
|
||||
const int list_item_padding =
|
||||
|
@@ -38,7 +38,8 @@ CredentialsSelectionView::CredentialsSelectionView(
|
||||
DCHECK(!password_forms_->empty());
|
||||
|
||||
// Layout.
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
SetLayoutManager(layout);
|
||||
|
||||
// ColumnSet.
|
||||
|
@@ -250,7 +250,8 @@ void ManagePasswordItemsView::RecreateLayout() {
|
||||
|
||||
RemoveAllChildViews(true);
|
||||
|
||||
views::GridLayout* grid_layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* grid_layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
|
||||
const int vertical_padding = ChromeLayoutProvider::Get()->GetDistanceMetric(
|
||||
DISTANCE_CONTROL_LIST_VERTICAL);
|
||||
|
@@ -558,7 +558,8 @@ gfx::Size ManagePasswordsBubbleView::PendingView::CalculatePreferredSize()
|
||||
|
||||
void ManagePasswordsBubbleView::PendingView::CreateAndSetLayout(
|
||||
bool show_password_label) {
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
layout->set_minimum_size(gfx::Size(kDesiredBubbleWidth, 0));
|
||||
|
||||
views::View* password_field =
|
||||
@@ -663,7 +664,8 @@ class ManagePasswordsBubbleView::SaveConfirmationView
|
||||
ManagePasswordsBubbleView::SaveConfirmationView::SaveConfirmationView(
|
||||
ManagePasswordsBubbleView* parent)
|
||||
: parent_(parent) {
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
layout->set_minimum_size(gfx::Size(kDesiredBubbleWidth, 0));
|
||||
|
||||
views::StyledLabel* confirmation =
|
||||
@@ -733,7 +735,8 @@ class ManagePasswordsBubbleView::SignInPromoView
|
||||
ManagePasswordsBubbleView::SignInPromoView::SignInPromoView(
|
||||
ManagePasswordsBubbleView* parent)
|
||||
: parent_(parent) {
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
layout->set_minimum_size(gfx::Size(kDesiredBubbleWidth, 0));
|
||||
|
||||
signin_button_ = views::MdTextButton::CreateSecondaryUiBlueButton(
|
||||
@@ -800,7 +803,8 @@ ManagePasswordsBubbleView::UpdatePendingView::UpdatePendingView(
|
||||
ManagePasswordsBubbleView* parent)
|
||||
: parent_(parent), selection_view_(nullptr) {
|
||||
ChromeLayoutProvider* layout_provider = ChromeLayoutProvider::Get();
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
layout->set_minimum_size(gfx::Size(kDesiredBubbleWidth, 0));
|
||||
|
||||
// Credential row.
|
||||
|
@@ -293,7 +293,7 @@ CreditCardEditorViewController::CreateCustomFieldView(
|
||||
} else {
|
||||
// Two comboboxes, one for month and the other for year.
|
||||
views::GridLayout* combobox_layout =
|
||||
views::GridLayout::CreateAndInstall(view.get());
|
||||
view->SetLayoutManager(std::make_unique<views::GridLayout>(view.get()));
|
||||
views::ColumnSet* columns = combobox_layout->AddColumnSet(0);
|
||||
columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER, 1,
|
||||
views::GridLayout::USE_PREF, 0, 0);
|
||||
|
@@ -148,7 +148,8 @@ base::string16 CvcUnmaskViewController::GetSheetTitle() {
|
||||
}
|
||||
|
||||
void CvcUnmaskViewController::FillContentView(views::View* content_view) {
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(content_view);
|
||||
views::GridLayout* layout = content_view->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(content_view));
|
||||
content_view->SetBorder(views::CreateEmptyBorder(
|
||||
kPaymentRequestRowVerticalInsets, kPaymentRequestRowHorizontalInsets,
|
||||
kPaymentRequestRowVerticalInsets, kPaymentRequestRowHorizontalInsets));
|
||||
|
@@ -251,8 +251,8 @@ std::unique_ptr<views::View> EditorViewController::CreateEditorView() {
|
||||
constexpr int kShortFieldMinimumWidth = 176;
|
||||
constexpr int kLongFieldMinimumWidth = 272;
|
||||
|
||||
views::GridLayout* editor_layout =
|
||||
views::GridLayout::CreateAndInstall(editor_view.get());
|
||||
views::GridLayout* editor_layout = editor_view->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(editor_view.get()));
|
||||
// Column set for short fields.
|
||||
views::ColumnSet* columns_short = editor_layout->AddColumnSet(0);
|
||||
columns_short->AddColumn(views::GridLayout::LEADING,
|
||||
|
@@ -57,7 +57,8 @@ std::unique_ptr<views::View> CreateLineItemView(const base::string16& label,
|
||||
ui::NativeTheme::kColorId_SeparatorColor),
|
||||
row_insets));
|
||||
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(row.get());
|
||||
views::GridLayout* layout =
|
||||
row->SetLayoutManager(std::make_unique<views::GridLayout>(row.get()));
|
||||
|
||||
views::ColumnSet* columns = layout->AddColumnSet(0);
|
||||
// The first column has resize_percent = 1 so that it stretches all the way
|
||||
@@ -94,8 +95,8 @@ std::unique_ptr<views::View> CreateLineItemView(const base::string16& label,
|
||||
amount_text->SetAllowCharacterBreak(true);
|
||||
|
||||
std::unique_ptr<views::View> amount_wrapper = base::MakeUnique<views::View>();
|
||||
views::GridLayout* wrapper_layout =
|
||||
views::GridLayout::CreateAndInstall(amount_wrapper.get());
|
||||
views::GridLayout* wrapper_layout = amount_wrapper->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(amount_wrapper.get()));
|
||||
views::ColumnSet* wrapper_columns = wrapper_layout->AddColumnSet(0);
|
||||
wrapper_columns->AddColumn(views::GridLayout::LEADING,
|
||||
views::GridLayout::CENTER, 0,
|
||||
|
@@ -371,8 +371,8 @@ void PaymentRequestDialogView::SetupSpinnerOverlay() {
|
||||
// would be under it.
|
||||
throbber_overlay_.SetBackground(views::CreateSolidBackground(SK_ColorWHITE));
|
||||
|
||||
views::GridLayout* layout =
|
||||
views::GridLayout::CreateAndInstall(&throbber_overlay_);
|
||||
views::GridLayout* layout = throbber_overlay_.SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(&throbber_overlay_));
|
||||
views::ColumnSet* throbber_columns = layout->AddColumnSet(0);
|
||||
throbber_columns->AddPaddingColumn(0.5, 0);
|
||||
throbber_columns->AddColumn(views::GridLayout::Alignment::CENTER,
|
||||
|
@@ -63,7 +63,8 @@ void PaymentRequestItemList::Item::Init() {
|
||||
std::unique_ptr<views::View> content =
|
||||
CreateContentView(&accessible_item_description_);
|
||||
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
|
||||
// Add a column for the item's content view.
|
||||
views::ColumnSet* columns = layout->AddColumnSet(0);
|
||||
|
@@ -218,7 +218,8 @@ std::unique_ptr<views::View> PaymentRequestSheetController::CreateView() {
|
||||
// layer) won't do proper clipping.
|
||||
view->SetPaintToLayer();
|
||||
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(view.get());
|
||||
views::GridLayout* layout =
|
||||
view->SetLayoutManager(std::make_unique<views::GridLayout>(view.get()));
|
||||
|
||||
// Note: each view is responsible for its own padding (insets).
|
||||
views::ColumnSet* columns = layout->AddColumnSet(0);
|
||||
@@ -236,7 +237,8 @@ std::unique_ptr<views::View> PaymentRequestSheetController::CreateView() {
|
||||
// otherwise it'll be sized to the ScrollView's viewport height, preventing
|
||||
// the scroll bar from ever being shown.
|
||||
pane_ = new views::View;
|
||||
views::GridLayout* pane_layout = views::GridLayout::CreateAndInstall(pane_);
|
||||
views::GridLayout* pane_layout =
|
||||
pane_->SetLayoutManager(std::make_unique<views::GridLayout>(pane_));
|
||||
views::ColumnSet* pane_columns = pane_layout->AddColumnSet(0);
|
||||
pane_columns->AddColumn(views::GridLayout::Alignment::FILL,
|
||||
views::GridLayout::Alignment::LEADING, 0,
|
||||
@@ -343,8 +345,8 @@ std::unique_ptr<views::View> PaymentRequestSheetController::CreateFooterView() {
|
||||
container->SetBorder(
|
||||
views::CreateEmptyBorder(kInset, kInset, kInset, kInset));
|
||||
|
||||
views::GridLayout* layout =
|
||||
views::GridLayout::CreateAndInstall(container.get());
|
||||
views::GridLayout* layout = container->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(container.get()));
|
||||
|
||||
views::ColumnSet* columns = layout->AddColumnSet(0);
|
||||
columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER,
|
||||
|
@@ -185,8 +185,8 @@ std::unique_ptr<views::View> CreateSheetHeaderView(
|
||||
const base::string16& title,
|
||||
views::ButtonListener* listener) {
|
||||
std::unique_ptr<views::View> container = base::MakeUnique<views::View>();
|
||||
views::GridLayout* layout =
|
||||
views::GridLayout::CreateAndInstall(container.get());
|
||||
views::GridLayout* layout = container->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(container.get()));
|
||||
|
||||
constexpr int kHeaderTopVerticalInset = 14;
|
||||
constexpr int kHeaderBottomVerticalInset = 8;
|
||||
|
@@ -151,7 +151,8 @@ std::unique_ptr<PaymentRequestRowView> CreatePaymentSheetRow(
|
||||
kPaymentRequestRowVerticalInsets, trailing_inset);
|
||||
std::unique_ptr<PaymentRequestRowView> row =
|
||||
base::MakeUnique<PaymentRequestRowView>(listener, clickable, row_insets);
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(row.get());
|
||||
views::GridLayout* layout =
|
||||
row->SetLayoutManager(std::make_unique<views::GridLayout>(row.get()));
|
||||
|
||||
views::ColumnSet* columns = layout->AddColumnSet(0);
|
||||
// A column for the section name.
|
||||
@@ -211,8 +212,8 @@ std::unique_ptr<views::View> CreateInlineCurrencyAmountItem(
|
||||
bool bold) {
|
||||
std::unique_ptr<views::View> item_amount_line =
|
||||
base::MakeUnique<views::View>();
|
||||
views::GridLayout* item_amount_layout =
|
||||
views::GridLayout::CreateAndInstall(item_amount_line.get());
|
||||
views::GridLayout* item_amount_layout = item_amount_line->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(item_amount_line.get()));
|
||||
views::ColumnSet* item_amount_columns = item_amount_layout->AddColumnSet(0);
|
||||
item_amount_columns->AddColumn(views::GridLayout::LEADING,
|
||||
views::GridLayout::LEADING, 0,
|
||||
@@ -412,7 +413,8 @@ base::string16 PaymentSheetViewController::GetSheetTitle() {
|
||||
}
|
||||
|
||||
void PaymentSheetViewController::FillContentView(views::View* content_view) {
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(content_view);
|
||||
views::GridLayout* layout = content_view->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(content_view));
|
||||
views::ColumnSet* columns = layout->AddColumnSet(0);
|
||||
columns->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER, 1,
|
||||
views::GridLayout::USE_PREF, 0, 0);
|
||||
@@ -561,8 +563,8 @@ void PaymentSheetViewController::UpdatePayButtonState(bool enabled) {
|
||||
std::unique_ptr<PaymentRequestRowView>
|
||||
PaymentSheetViewController::CreatePaymentSheetSummaryRow() {
|
||||
std::unique_ptr<views::View> inline_summary = base::MakeUnique<views::View>();
|
||||
views::GridLayout* layout =
|
||||
views::GridLayout::CreateAndInstall(inline_summary.get());
|
||||
views::GridLayout* layout = inline_summary->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(inline_summary.get()));
|
||||
views::ColumnSet* columns = layout->AddColumnSet(0);
|
||||
columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, 1,
|
||||
views::GridLayout::USE_PREF, 0, 0);
|
||||
@@ -727,8 +729,8 @@ PaymentSheetViewController::CreatePaymentMethodRow() {
|
||||
if (selected_instrument) {
|
||||
std::unique_ptr<views::View> content_view = base::MakeUnique<views::View>();
|
||||
|
||||
views::GridLayout* layout =
|
||||
views::GridLayout::CreateAndInstall(content_view.get());
|
||||
views::GridLayout* layout = content_view->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(content_view.get()));
|
||||
views::ColumnSet* columns = layout->AddColumnSet(0);
|
||||
columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER, 1,
|
||||
views::GridLayout::USE_PREF, 0, 0);
|
||||
|
@@ -209,7 +209,8 @@ void ForcedReauthenticationDialogView::AddedToWidget() {
|
||||
provider->GetDialogInsetsForContentType(views::TEXT, views::TEXT);
|
||||
SetBorder(views::CreateEmptyBorder(dialog_insets.top(), 0,
|
||||
dialog_insets.bottom(), 0));
|
||||
views::GridLayout* dialog_layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* dialog_layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
SetLayoutManager(dialog_layout);
|
||||
|
||||
// Use a column set with no padding.
|
||||
|
@@ -118,7 +118,8 @@ bool IsProfileChooser(profiles::BubbleViewMode mode) {
|
||||
// Creates a GridLayout with a single column. This ensures that all the child
|
||||
// views added get auto-expanded to fill the full width of the bubble.
|
||||
views::GridLayout* CreateSingleColumnLayout(views::View* view, int width) {
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(view);
|
||||
views::GridLayout* layout =
|
||||
view->SetLayoutManager(std::make_unique<views::GridLayout>(view));
|
||||
|
||||
views::ColumnSet* columns = layout->AddColumnSet(0);
|
||||
columns->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 0,
|
||||
@@ -202,8 +203,8 @@ class TitleCard : public views::View {
|
||||
TitleCard* title_card,
|
||||
int width) {
|
||||
views::View* titled_view = new views::View();
|
||||
views::GridLayout* layout =
|
||||
views::GridLayout::CreateAndInstall(titled_view);
|
||||
views::GridLayout* layout = titled_view->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(titled_view));
|
||||
|
||||
ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
|
||||
const gfx::Insets dialog_insets =
|
||||
|
@@ -94,7 +94,8 @@ void ProximityAuthErrorBubbleView::Init() {
|
||||
// ----------------------------
|
||||
// | icon | padding | message |
|
||||
// ----------------------------
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
views::ColumnSet* columns = layout->AddColumnSet(0);
|
||||
columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, 0,
|
||||
views::GridLayout::USE_PREF, 0, 0);
|
||||
|
@@ -52,7 +52,8 @@ SadTabView::SadTabView(content::WebContents* web_contents, SadTabKind kind)
|
||||
SetBackground(views::CreateThemedSolidBackground(
|
||||
this, ui::NativeTheme::kColorId_DialogBackground));
|
||||
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
|
||||
const int column_set_id = 0;
|
||||
views::ColumnSet* columns = layout->AddColumnSet(column_set_id);
|
||||
|
@@ -242,7 +242,8 @@ views::View* SessionCrashedBubbleView::CreateFootnoteView() {
|
||||
|
||||
// Create a view to hold the checkbox and the text.
|
||||
views::View* uma_view = new views::View();
|
||||
GridLayout* uma_layout = GridLayout::CreateAndInstall(uma_view);
|
||||
GridLayout* uma_layout =
|
||||
uma_view->SetLayoutManager(std::make_unique<views::GridLayout>(uma_view));
|
||||
uma_view->SetLayoutManager(uma_layout);
|
||||
|
||||
const int kReportColumnSetId = 0;
|
||||
|
@@ -88,7 +88,8 @@ OneClickSigninDialogView::~OneClickSigninDialogView() {
|
||||
}
|
||||
|
||||
void OneClickSigninDialogView::Init() {
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
|
||||
// Column set for descriptive text and link.
|
||||
views::ColumnSet* cs = layout->AddColumnSet(0);
|
||||
|
@@ -207,11 +207,12 @@ void ProfileSigninConfirmationDialogViews::ViewHierarchyChanged(
|
||||
// insets.
|
||||
SetBorder(views::CreateEmptyBorder(content_insets.top(), 0,
|
||||
content_insets.bottom(), 0));
|
||||
views::GridLayout* dialog_layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* dialog_layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
|
||||
// Use GridLayout inside the prompt bar because StyledLabel requires it.
|
||||
views::GridLayout* prompt_layout =
|
||||
views::GridLayout::CreateAndInstall(prompt_bar);
|
||||
views::GridLayout* prompt_layout = prompt_bar->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(prompt_bar));
|
||||
prompt_bar->SetBorder(
|
||||
views::CreateEmptyBorder(ChromeLayoutProvider::Get()->GetInsetsMetric(
|
||||
views::INSETS_DIALOG_SUBSECTION)));
|
||||
|
@@ -570,7 +570,8 @@ views::View* TranslateBubbleView::CreateViewBeforeTranslate() {
|
||||
}
|
||||
|
||||
views::View* view = new views::View();
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(view);
|
||||
views::GridLayout* layout =
|
||||
view->SetLayoutManager(std::make_unique<views::GridLayout>(view));
|
||||
|
||||
using views::GridLayout;
|
||||
|
||||
@@ -675,7 +676,8 @@ views::View* TranslateBubbleView::CreateViewTranslating() {
|
||||
model_->GetLanguageNameAt(model_->GetTargetLanguageIndex());
|
||||
|
||||
views::View* view = new views::View();
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(view);
|
||||
views::GridLayout* layout =
|
||||
view->SetLayoutManager(std::make_unique<views::GridLayout>(view));
|
||||
|
||||
using views::GridLayout;
|
||||
|
||||
@@ -738,7 +740,8 @@ views::View* TranslateBubbleView::CreateViewTranslating() {
|
||||
|
||||
views::View* TranslateBubbleView::CreateViewAfterTranslate() {
|
||||
views::View* view = new views::View();
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(view);
|
||||
views::GridLayout* layout =
|
||||
view->SetLayoutManager(std::make_unique<views::GridLayout>(view));
|
||||
|
||||
using views::GridLayout;
|
||||
|
||||
@@ -799,7 +802,8 @@ views::View* TranslateBubbleView::CreateViewAfterTranslate() {
|
||||
|
||||
views::View* TranslateBubbleView::CreateViewError() {
|
||||
views::View* view = new views::View();
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(view);
|
||||
views::GridLayout* layout =
|
||||
view->SetLayoutManager(std::make_unique<views::GridLayout>(view));
|
||||
|
||||
using views::GridLayout;
|
||||
|
||||
@@ -894,7 +898,8 @@ views::View* TranslateBubbleView::CreateViewAdvanced() {
|
||||
}
|
||||
|
||||
views::View* view = new views::View();
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(view);
|
||||
views::GridLayout* layout =
|
||||
view->SetLayoutManager(std::make_unique<views::GridLayout>(view));
|
||||
|
||||
using views::GridLayout;
|
||||
|
||||
|
@@ -1026,8 +1026,8 @@ void TryChromeDialog::OnContextInitialized() {
|
||||
|
||||
auto contents_view = std::make_unique<ClickableView>();
|
||||
contents_view->SetBackground(views::CreateSolidBackground(kBackgroundColor));
|
||||
views::GridLayout* layout =
|
||||
views::GridLayout::CreateAndInstall(contents_view.get());
|
||||
views::GridLayout* layout = contents_view->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(contents_view.get()));
|
||||
layout->set_minimum_size(gfx::Size(kToastWidth, 0));
|
||||
views::ColumnSet* columns;
|
||||
|
||||
|
@@ -47,7 +47,8 @@ void UninstallView::SetupControls() {
|
||||
using views::ColumnSet;
|
||||
using views::GridLayout;
|
||||
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(this);
|
||||
GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
|
||||
// Message to confirm uninstallation.
|
||||
int column_set_id = 0;
|
||||
|
@@ -116,7 +116,8 @@ class ShellWindowDelegateView : public views::WidgetDelegateView,
|
||||
void InitShellWindow() {
|
||||
SetBackground(views::CreateStandardPanelBackground());
|
||||
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
|
||||
views::ColumnSet* column_set = layout->AddColumnSet(0);
|
||||
if (!shell_->hide_toolbar())
|
||||
@@ -130,8 +131,8 @@ class ShellWindowDelegateView : public views::WidgetDelegateView,
|
||||
if (!shell_->hide_toolbar()) {
|
||||
layout->AddPaddingRow(0, 2);
|
||||
layout->StartRow(0, 0);
|
||||
views::GridLayout* toolbar_layout =
|
||||
views::GridLayout::CreateAndInstall(toolbar_view_);
|
||||
views::GridLayout* toolbar_layout = toolbar_view_->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(toolbar_view_));
|
||||
|
||||
views::ColumnSet* toolbar_column_set =
|
||||
toolbar_layout->AddColumnSet(0);
|
||||
|
@@ -53,7 +53,8 @@ class CatalogViewerContents : public views::WidgetDelegateView,
|
||||
SetBorder(views::CreateEmptyBorder(gfx::Insets(kPadding)));
|
||||
SetBackground(views::CreateStandardPanelBackground());
|
||||
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
|
||||
views::ColumnSet* columns = layout->AddColumnSet(0);
|
||||
columns->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 0,
|
||||
|
@@ -275,7 +275,8 @@ class WindowTypeLauncherView : public views::WidgetDelegateView,
|
||||
MdTextButton::Create(this, base::ASCIIToUTF16("Jank for (s):"))),
|
||||
jank_duration_field_(new views::Textfield) {
|
||||
SetBorder(views::CreateEmptyBorder(gfx::Insets(5)));
|
||||
views::GridLayout* layout = views::GridLayout::CreateAndInstall(this);
|
||||
views::GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
views::ColumnSet* column_set = layout->AddColumnSet(0);
|
||||
column_set->AddColumn(views::GridLayout::LEADING,
|
||||
views::GridLayout::CENTER,
|
||||
|
@@ -114,7 +114,7 @@ void SuggestionsContainerView::SetFirstResultSelected(bool selected) {}
|
||||
void SuggestionsContainerView::CreateAppsGrid(int apps_num) {
|
||||
DCHECK(search_result_tile_views_.empty());
|
||||
views::GridLayout* tiles_layout_manager =
|
||||
views::GridLayout::CreateAndInstall(this);
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
SetLayoutManager(tiles_layout_manager);
|
||||
|
||||
views::ColumnSet* column_set = tiles_layout_manager->AddColumnSet(0);
|
||||
|
@@ -377,7 +377,8 @@ ColorChooserView::ColorChooserView(ColorChooserListener* listener,
|
||||
AddChildView(container);
|
||||
|
||||
View* container2 = new View();
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(container2);
|
||||
GridLayout* layout = container2->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(container2));
|
||||
ColumnSet* columns = layout->AddColumnSet(0);
|
||||
columns->AddColumn(
|
||||
GridLayout::LEADING, GridLayout::FILL, 0, GridLayout::USE_PREF, 0, 0);
|
||||
|
@@ -218,7 +218,8 @@ void MessageBoxView::Init(const InitParams& params) {
|
||||
|
||||
void MessageBoxView::ResetLayoutManager() {
|
||||
// Initialize the Grid Layout Manager used for this dialog box.
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(this);
|
||||
GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
|
||||
// Add the column set for the message displayed at the top of the dialog box.
|
||||
constexpr int kMessageViewColumnSetId = 0;
|
||||
|
@@ -31,7 +31,8 @@ GridLayout* MakeStretchyGridLayout(View* host, int ncols) {
|
||||
const GridLayout::SizeType kColumnUsesFixedSize = GridLayout::FIXED;
|
||||
const int kColumnWidth = 96;
|
||||
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(host);
|
||||
GridLayout* layout =
|
||||
host->SetLayoutManager(std::make_unique<views::GridLayout>(host));
|
||||
ColumnSet* columns = layout->AddColumnSet(kStretchyGridColumnSetId);
|
||||
for (int i = 0; i < ncols; ++i) {
|
||||
if (i != 0)
|
||||
|
@@ -132,7 +132,8 @@ void DialogExample::CreateExampleView(View* container) {
|
||||
views::LayoutProvider* provider = views::LayoutProvider::Get();
|
||||
const int horizontal_spacing =
|
||||
provider->GetDistanceMetric(views::DISTANCE_RELATED_BUTTON_HORIZONTAL);
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(container);
|
||||
GridLayout* layout = container->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(container));
|
||||
ColumnSet* column_set = layout->AddColumnSet(kFieldsColumnId);
|
||||
column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, kFixed,
|
||||
GridLayout::USE_PREF, 0, 0);
|
||||
|
@@ -143,7 +143,8 @@ class ExamplesWindowContents : public WidgetDelegateView,
|
||||
combobox_->ModelChanged();
|
||||
|
||||
SetBackground(CreateStandardPanelBackground());
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(this);
|
||||
GridLayout* layout =
|
||||
SetLayoutManager(std::make_unique<views::GridLayout>(this));
|
||||
ColumnSet* column_set = layout->AddColumnSet(0);
|
||||
column_set->AddPaddingColumn(0, 5);
|
||||
column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
|
||||
|
@@ -163,7 +163,8 @@ void LabelExample::AddCustomLabel(View* container) {
|
||||
View* control_container = new View();
|
||||
control_container->SetBorder(CreateSolidBorder(2, SK_ColorGRAY));
|
||||
control_container->SetBackground(CreateSolidBackground(SK_ColorLTGRAY));
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(control_container);
|
||||
GridLayout* layout = control_container->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(control_container));
|
||||
|
||||
ColumnSet* column_set = layout->AddColumnSet(0);
|
||||
column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL,
|
||||
|
@@ -27,7 +27,8 @@ void MessageBoxExample::CreateExampleView(View* container) {
|
||||
status_ = new LabelButton(this, ASCIIToUTF16("Show Status"));
|
||||
toggle_ = new LabelButton(this, ASCIIToUTF16("Toggle Checkbox"));
|
||||
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(container);
|
||||
GridLayout* layout = container->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(container));
|
||||
|
||||
message_box_view_->SetCheckBoxLabel(ASCIIToUTF16("Check Box"));
|
||||
|
||||
|
@@ -159,7 +159,8 @@ void MultilineExample::CreateExampleView(View* container) {
|
||||
textfield_->set_controller(this);
|
||||
textfield_->SetText(kTestString);
|
||||
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(container);
|
||||
GridLayout* layout = container->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(container));
|
||||
|
||||
ColumnSet* column_set = layout->AddColumnSet(0);
|
||||
column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER,
|
||||
|
@@ -36,7 +36,8 @@ ProgressBarExample::~ProgressBarExample() {
|
||||
}
|
||||
|
||||
void ProgressBarExample::CreateExampleView(View* container) {
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(container);
|
||||
GridLayout* layout = container->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(container));
|
||||
|
||||
ColumnSet* column_set = layout->AddColumnSet(0);
|
||||
column_set->AddColumn(GridLayout::TRAILING, GridLayout::CENTER, 0,
|
||||
|
@@ -38,7 +38,8 @@ void RadioButtonExample::CreateExampleView(View* container) {
|
||||
radio_buttons_[i]->set_listener(this);
|
||||
}
|
||||
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(container);
|
||||
GridLayout* layout = container->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(container));
|
||||
|
||||
ColumnSet* column_set = layout->AddColumnSet(0);
|
||||
column_set->AddColumn(GridLayout::FILL, GridLayout::FILL,
|
||||
|
@@ -87,7 +87,8 @@ void ScrollViewExample::CreateExampleView(View* container) {
|
||||
scrollable_->SetBounds(0, 0, 1000, 100);
|
||||
scrollable_->SetColor(SK_ColorYELLOW, SK_ColorCYAN);
|
||||
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(container);
|
||||
GridLayout* layout = container->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(container));
|
||||
|
||||
// Add scroll view.
|
||||
ColumnSet* column_set = layout->AddColumnSet(0);
|
||||
|
@@ -27,7 +27,8 @@ void TabbedPaneExample::CreateExampleView(View* container) {
|
||||
add_at_ = new LabelButton(this, ASCIIToUTF16("Add At 1"));
|
||||
select_at_ = new LabelButton(this, ASCIIToUTF16("Select At 1"));
|
||||
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(container);
|
||||
GridLayout* layout = container->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(container));
|
||||
|
||||
const int tabbed_pane_column = 0;
|
||||
ColumnSet* column_set = layout->AddColumnSet(tabbed_pane_column);
|
||||
|
@@ -58,7 +58,8 @@ void TableExample::CreateExampleView(View* container) {
|
||||
column4_visible_checkbox_->SetChecked(true);
|
||||
column4_visible_checkbox_->set_listener(this);
|
||||
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(container);
|
||||
GridLayout* layout = container->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(container));
|
||||
|
||||
std::vector<ui::TableColumn> columns;
|
||||
columns.push_back(TestTableColumn(0, "Fruit"));
|
||||
|
@@ -160,7 +160,8 @@ Combobox* TextExample::AddCombobox(GridLayout* layout,
|
||||
void TextExample::CreateExampleView(View* container) {
|
||||
text_view_ = new TextExampleView;
|
||||
text_view_->SetBorder(CreateSolidBorder(1, SK_ColorGRAY));
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(container);
|
||||
GridLayout* layout = container->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(container));
|
||||
layout->AddPaddingRow(0, 8);
|
||||
|
||||
ColumnSet* column_set = layout->AddColumnSet(0);
|
||||
|
@@ -61,7 +61,8 @@ void TextfieldExample::CreateExampleView(View* container) {
|
||||
name_->set_controller(this);
|
||||
password_->set_controller(this);
|
||||
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(container);
|
||||
GridLayout* layout = container->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(container));
|
||||
|
||||
ColumnSet* column_set = layout->AddColumnSet(0);
|
||||
column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL,
|
||||
|
@@ -80,7 +80,8 @@ void TreeViewExample::CreateExampleView(View* container) {
|
||||
change_title_->SetFocusForPlatform();
|
||||
change_title_->set_request_focus_on_press(true);
|
||||
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(container);
|
||||
GridLayout* layout = container->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(container));
|
||||
|
||||
const int tree_view_column = 0;
|
||||
ColumnSet* column_set = layout->AddColumnSet(tree_view_column);
|
||||
|
@@ -775,15 +775,11 @@ bool ColumnSet::CanUseMinimum(const ViewState& view_state) const {
|
||||
|
||||
// GridLayout -------------------------------------------------------------
|
||||
|
||||
// static
|
||||
GridLayout* GridLayout::CreateAndInstall(View* host) {
|
||||
GridLayout* result = new GridLayout(host);
|
||||
host->SetLayoutManager(result);
|
||||
return result;
|
||||
GridLayout::GridLayout(View* host) : host_(host) {
|
||||
DCHECK(host);
|
||||
}
|
||||
|
||||
GridLayout::~GridLayout() {
|
||||
}
|
||||
GridLayout::~GridLayout() {}
|
||||
|
||||
ColumnSet* GridLayout::AddColumnSet(int id) {
|
||||
DCHECK(GetColumnSet(id) == nullptr);
|
||||
@@ -939,17 +935,6 @@ int GridLayout::GetPreferredHeightForWidth(const View* host, int width) const {
|
||||
return pref.height();
|
||||
}
|
||||
|
||||
GridLayout::GridLayout(View* host)
|
||||
: host_(host),
|
||||
calculated_master_columns_(false),
|
||||
remaining_row_span_(0),
|
||||
current_row_(-1),
|
||||
next_column_(0),
|
||||
current_row_col_set_(nullptr),
|
||||
adding_view_(false) {
|
||||
DCHECK(host);
|
||||
}
|
||||
|
||||
void GridLayout::SizeRowsAndColumns(bool layout, int width, int height,
|
||||
gfx::Size* pref) const {
|
||||
// Protect against clients asking for metrics during the addition of a View.
|
||||
|
@@ -107,11 +107,7 @@ class VIEWS_EXPORT GridLayout : public LayoutManager {
|
||||
USE_PREF
|
||||
};
|
||||
|
||||
// Creates a new GridLayout and installs it as the LayoutManager for |host|.
|
||||
// The returned pointer is owned by the view and already installed as its
|
||||
// layout manager.
|
||||
static GridLayout* CreateAndInstall(View* host);
|
||||
|
||||
explicit GridLayout(View* host);
|
||||
~GridLayout() override;
|
||||
|
||||
// See class description for what this does.
|
||||
@@ -192,8 +188,6 @@ class VIEWS_EXPORT GridLayout : public LayoutManager {
|
||||
void set_minimum_size(const gfx::Size& size) { minimum_size_ = size; }
|
||||
|
||||
private:
|
||||
explicit GridLayout(View* host);
|
||||
|
||||
// As both Layout and GetPreferredSize need to do nearly the same thing,
|
||||
// they both call into this method. This sizes the Columns/Rows as
|
||||
// appropriate. If layout is true, width/height give the width/height the
|
||||
@@ -234,23 +228,23 @@ class VIEWS_EXPORT GridLayout : public LayoutManager {
|
||||
View* const host_;
|
||||
|
||||
// Whether or not we've calculated the master/linked columns.
|
||||
mutable bool calculated_master_columns_;
|
||||
mutable bool calculated_master_columns_ = false;
|
||||
|
||||
// Used to verify a view isn't added with a row span that expands into
|
||||
// another column structure.
|
||||
int remaining_row_span_;
|
||||
int remaining_row_span_ = 0;
|
||||
|
||||
// Current row.
|
||||
int current_row_;
|
||||
int current_row_ = -1;
|
||||
|
||||
// Current column.
|
||||
int next_column_;
|
||||
int next_column_ = 0;
|
||||
|
||||
// Column set for the current row. This is null for padding rows.
|
||||
ColumnSet* current_row_col_set_;
|
||||
ColumnSet* current_row_col_set_ = nullptr;
|
||||
|
||||
// Set to true when adding a View.
|
||||
bool adding_view_;
|
||||
bool adding_view_ = false;
|
||||
|
||||
// ViewStates. This is ordered by row_span in ascending order.
|
||||
mutable std::vector<std::unique_ptr<ViewState>> view_states_;
|
||||
|
@@ -99,7 +99,10 @@ class FlexibleView : public View {
|
||||
|
||||
class GridLayoutTest : public testing::Test {
|
||||
public:
|
||||
GridLayoutTest() : layout_(GridLayout::CreateAndInstall(&host_)) {}
|
||||
GridLayoutTest() {
|
||||
layout_ =
|
||||
host_.SetLayoutManager(std::make_unique<views::GridLayout>(&host_));
|
||||
}
|
||||
|
||||
void RemoveAll() {
|
||||
for (int i = host_.child_count() - 1; i >= 0; i--)
|
||||
@@ -118,7 +121,9 @@ class GridLayoutTest : public testing::Test {
|
||||
|
||||
class GridLayoutAlignmentTest : public testing::Test {
|
||||
public:
|
||||
GridLayoutAlignmentTest() : layout_(GridLayout::CreateAndInstall(&host_)) {
|
||||
GridLayoutAlignmentTest() {
|
||||
layout_ =
|
||||
host_.SetLayoutManager(std::make_unique<views::GridLayout>(&host_));
|
||||
v1_.SetPreferredSize(gfx::Size(10, 20));
|
||||
}
|
||||
|
||||
|
@@ -342,7 +342,8 @@ void DialogClientView::SetupLayout() {
|
||||
|
||||
// Clobber any existing LayoutManager since it has weak references to child
|
||||
// Views which may be removed by SetupViews().
|
||||
GridLayout* layout = GridLayout::CreateAndInstall(button_row_container_);
|
||||
GridLayout* layout = button_row_container_->SetLayoutManager(
|
||||
std::make_unique<views::GridLayout>(button_row_container_));
|
||||
layout->set_minimum_size(minimum_size_);
|
||||
|
||||
SetupViews();
|
||||
|
Reference in New Issue
Block a user