diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-29 07:53:54 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-29 07:53:54 +0000 |
| commit | 53b154ca224b8c72ad5af70141732abf1eaba143 (patch) | |
| tree | 17d60e73beb62ea61b1053ed3782fa9c322079f1 /chrome/browser | |
| parent | f58330c4b964edd22ef02325390975a013a3f34a (diff) | |
| download | chromium_src-53b154ca224b8c72ad5af70141732abf1eaba143.zip chromium_src-53b154ca224b8c72ad5af70141732abf1eaba143.tar.gz chromium_src-53b154ca224b8c72ad5af70141732abf1eaba143.tar.bz2 | |
Show detail link and Accept/Cancel buttons should be on same horizontal line in cookie prompt.
BUG=38979
TEST=set cookie settings to ask, go to google.com
Review URL: http://codereview.chromium.org/1394004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42936 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/views/cookie_prompt_view.cc | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/chrome/browser/views/cookie_prompt_view.cc b/chrome/browser/views/cookie_prompt_view.cc index dacc169..f89724ad 100644 --- a/chrome/browser/views/cookie_prompt_view.cc +++ b/chrome/browser/views/cookie_prompt_view.cc @@ -193,15 +193,19 @@ void CookiePromptView::Init() { const int inner_column_layout_id = 1; views::ColumnSet* inner_column_set = button_layout->AddColumnSet( inner_column_layout_id); + inner_column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1, + GridLayout::USE_PREF, 0, 0); + inner_column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); inner_column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0, GridLayout::USE_PREF, 0, 0); inner_column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); inner_column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0, GridLayout::USE_PREF, 0, 0); button_layout->StartRow(0, inner_column_layout_id); + button_layout->AddView(show_cookie_link_, 1, 1, + GridLayout::LEADING, GridLayout::TRAILING); button_layout->AddView(allow_button_); button_layout->AddView(block_button_); - layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); int button_column_layout_id = 2; views::ColumnSet* button_column_set = @@ -212,21 +216,7 @@ void CookiePromptView::Init() { button_column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); layout->StartRow(0, one_column_layout_id); layout->AddView(button_container, 1, 1, - GridLayout::TRAILING, GridLayout::CENTER); - layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); - - int link_column_layout_id = 3; - views::ColumnSet* link_column_set = - layout->AddColumnSet(link_column_layout_id); - link_column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); - link_column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0, - GridLayout::USE_PREF, 0, 0); - link_column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); - link_column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1, - GridLayout::USE_PREF, 0, 0); - link_column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); - layout->StartRow(0, link_column_layout_id); - layout->AddView(show_cookie_link_); + GridLayout::FILL, GridLayout::CENTER); layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); layout->StartRow(0, one_column_layout_id); @@ -274,7 +264,7 @@ void CookiePromptView::Init() { int CookiePromptView::GetExtendedViewHeight() { DCHECK(info_view_); return expanded_view_ ? - kRelatedControlVerticalSpacing : -info_view_->GetPreferredSize().height(); + 0 : -info_view_->GetPreferredSize().height(); } void CookiePromptView::ToggleDetailsViewExpand() { |