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

Unified Diff: chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.cc

Issue 2558483002: views: convert ToolbarActionsBarBubble to Harmony (Closed)
Patch Set: Created 4 years 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.cc
diff --git a/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.cc b/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.cc
index b0ef108dd5f6b852efb9e8329605e5ead3d802a5..30ca1bf1e3eb68c4d6faac45e301cf51ef69689e 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.cc
@@ -6,6 +6,7 @@
#include "chrome/browser/ui/toolbar/toolbar_actions_bar_bubble_delegate.h"
#include "chrome/browser/ui/view_ids.h"
+#include "chrome/browser/ui/views/harmony/layout_delegate.h"
#include "chrome/grit/locale_settings.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/color_palette.h"
@@ -16,10 +17,8 @@
#include "ui/views/controls/label.h"
#include "ui/views/controls/link.h"
#include "ui/views/layout/box_layout.h"
-#include "ui/views/layout/layout_constants.h"
namespace {
-const int kListPadding = 10;
const int kIconSize = 16;
}
@@ -72,7 +71,9 @@ views::View* ToolbarActionsBarBubbleViews::CreateExtraView() {
views::View* parent = new views::View();
parent->SetLayoutManager(
new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0,
- views::kRelatedControlVerticalSpacing));
+ LayoutDelegate::Get()->GetLayoutDistance(
+ LayoutDelegate::LayoutDistanceType::
+ RELATED_CONTROL_VERTICAL_SPACING)));
parent->AddChildView(icon.release());
parent->AddChildView(label.release());
return parent;
@@ -106,8 +107,11 @@ bool ToolbarActionsBarBubbleViews::Close() {
}
void ToolbarActionsBarBubbleViews::Init() {
- SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0,
- views::kRelatedControlVerticalSpacing));
+ LayoutDelegate* delegate = LayoutDelegate::Get();
+ SetLayoutManager(new views::BoxLayout(
+ views::BoxLayout::kVertical, 0, 0,
+ delegate->GetLayoutDistance(LayoutDelegate::LayoutDistanceType::
+ RELATED_CONTROL_VERTICAL_SPACING)));
// Add the content string.
views::Label* content_label = new views::Label(
@@ -120,9 +124,13 @@ void ToolbarActionsBarBubbleViews::Init() {
AddChildView(content_label);
base::string16 item_list = delegate_->GetItemListText();
+
if (!item_list.empty()) {
item_list_ = new views::Label(item_list);
- item_list_->SetBorder(views::CreateEmptyBorder(0, kListPadding, 0, 0));
+ item_list_->SetBorder(views::CreateEmptyBorder(
+ 0, delegate->GetLayoutDistance(LayoutDelegate::LayoutDistanceType::
+ RELATED_CONTROL_HORIZONTAL_SPACING),
+ 0, 0));
item_list_->SetMultiLine(true);
item_list_->SizeToFit(width);
item_list_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698