Update to Chromium revision ff259bab (#488528)

This commit is contained in:
Marshall Greenblatt
2017-07-26 19:19:27 -04:00
parent 6da2bbf229
commit f229796a39
416 changed files with 2724 additions and 2213 deletions

View File

@@ -53,12 +53,12 @@ CefBoxLayoutImpl::CefBoxLayoutImpl(const CefBoxLayoutSettings& settings)
: settings_(settings) {}
views::BoxLayout* CefBoxLayoutImpl::CreateLayout() {
views::BoxLayout* layout =
new views::BoxLayout(settings_.horizontal ? views::BoxLayout::kHorizontal
: views::BoxLayout::kVertical,
settings_.inside_border_horizontal_spacing,
settings_.inside_border_vertical_spacing,
settings_.between_child_spacing);
views::BoxLayout* layout = new views::BoxLayout(
settings_.horizontal ? views::BoxLayout::kHorizontal
: views::BoxLayout::kVertical,
gfx::Insets(settings_.inside_border_vertical_spacing,
settings_.inside_border_horizontal_spacing),
settings_.between_child_spacing);
layout->set_main_axis_alignment(
static_cast<views::BoxLayout::MainAxisAlignment>(
settings_.main_axis_alignment));