| Index: chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc
|
| diff --git a/chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc b/chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc
|
| index 4a412c6a53ccd7af07c70572614ddc340035e1bc..f6c2b8d4323da700c4ca03fc9dca3a4040b09c24 100644
|
| --- a/chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc
|
| +++ b/chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc
|
| @@ -30,6 +30,8 @@
|
| #include "ui/views/bubble/bubble_frame_view.h"
|
| #include "ui/views/controls/button/label_button.h"
|
| #include "ui/views/controls/button/label_button_border.h"
|
| +#include "ui/views/controls/label.h"
|
| +#include "ui/views/controls/separator.h"
|
| #include "ui/views/controls/table/table_view.h"
|
| #include "ui/views/controls/table/table_view_observer.h"
|
| #include "ui/views/layout/box_layout.h"
|
| @@ -146,6 +148,21 @@ ChooserBubbleUiViewDelegate::ChooserBubbleUiViewDelegate(
|
| owner_(owner),
|
| chooser_bubble_delegate_(chooser_bubble_delegate),
|
| button_pressed_(false) {
|
| + // ------------------------------------
|
| + // | Chooser bubble title |
|
| + // | -------------------------------- |
|
| + // | | option 0 | |
|
| + // | | option 1 | |
|
| + // | | option 2 | |
|
| + // | | | |
|
| + // | | | |
|
| + // | | | |
|
| + // | -------------------------------- |
|
| + // | [ Connect] [ Cancel ] |
|
| + // | -------------------------------- |
|
| + // | Privacy message |
|
| + // ------------------------------------
|
| +
|
| views::GridLayout* layout = new views::GridLayout(this);
|
| SetLayoutManager(layout);
|
|
|
| @@ -169,9 +186,8 @@ ChooserBubbleUiViewDelegate::ChooserBubbleUiViewDelegate(
|
| views::GridLayout::FILL, views::GridLayout::FILL,
|
| kChooserPermissionBubbleWidth,
|
| kChooserPermissionBubbleHeight);
|
| - if (chooser_bubble_delegate_->NumOptions() == 0) {
|
| + if (chooser_bubble_delegate_->NumOptions() == 0)
|
| table_view_->SetEnabled(false);
|
| - }
|
|
|
| layout->AddPaddingRow(0, kItemMajorSpacing);
|
|
|
| @@ -209,6 +225,25 @@ ChooserBubbleUiViewDelegate::ChooserBubbleUiViewDelegate(
|
| button_layout->AddView(cancel_button_);
|
|
|
| button_layout->AddPaddingRow(0, kBubbleOuterMargin);
|
| +
|
| + layout->AddPaddingRow(0, kItemMajorSpacing);
|
| +
|
| + // Lay out the separator.
|
| + layout->StartRow(1, 0);
|
| + views::Separator* separator =
|
| + new views::Separator(views::Separator::HORIZONTAL);
|
| + layout->AddView(separator);
|
| +
|
| + layout->AddPaddingRow(0, kItemMajorSpacing);
|
| +
|
| + // Lay out the privacy message label.
|
| + layout->StartRow(1, 0);
|
| + views::Label* label = new views::Label(
|
| + l10n_util::GetStringUTF16(IDS_CHOOSER_BUBBLE_PRIVACY_MESSAGE_TEXT));
|
| + label->SetMultiLine(true);
|
| + label->SizeToFit(kChooserPermissionBubbleWidth);
|
| + label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
|
| + layout->AddView(label);
|
| }
|
|
|
| ChooserBubbleUiViewDelegate::~ChooserBubbleUiViewDelegate() {
|
|
|