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

Side by Side Diff: chrome/browser/ui/views/autofill/autofill_dialog_views.cc

Issue 23526053: rAc: fix suggestion text line height on Views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 3 months 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/autofill/autofill_dialog_views.h" 5 #include "chrome/browser/ui/views/autofill/autofill_dialog_views.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 1042 matching lines...) Expand 10 before | Expand all | Expand 10 after
1053 // Label and icon. 1053 // Label and icon.
1054 label_container->AddChildView(icon_); 1054 label_container->AddChildView(icon_);
1055 label_->SetHorizontalAlignment(gfx::ALIGN_LEFT); 1055 label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
1056 label_container->AddChildView(label_); 1056 label_container->AddChildView(label_);
1057 1057
1058 // TODO(estade): get the sizing and spacing right on this textfield. 1058 // TODO(estade): get the sizing and spacing right on this textfield.
1059 decorated_->SetVisible(false); 1059 decorated_->SetVisible(false);
1060 decorated_->set_default_width_in_chars(15); 1060 decorated_->set_default_width_in_chars(15);
1061 label_container->AddChildView(decorated_); 1061 label_container->AddChildView(decorated_);
1062 1062
1063 // TODO(estade): need to get the line height right.
1064 label_line_2_->SetHorizontalAlignment(gfx::ALIGN_LEFT); 1063 label_line_2_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
1065 label_line_2_->SetVisible(false); 1064 label_line_2_->SetVisible(false);
1065 label_line_2_->SetLineHeight(22);
1066 label_line_2_->SetMultiLine(true); 1066 label_line_2_->SetMultiLine(true);
1067 AddChildView(label_line_2_); 1067 AddChildView(label_line_2_);
1068 1068
1069 SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0)); 1069 SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 7));
1070 } 1070 }
1071 1071
1072 AutofillDialogViews::SuggestionView::~SuggestionView() {} 1072 AutofillDialogViews::SuggestionView::~SuggestionView() {}
1073 1073
1074 gfx::Size AutofillDialogViews::SuggestionView::GetPreferredSize() { 1074 gfx::Size AutofillDialogViews::SuggestionView::GetPreferredSize() {
1075 // There's no preferred width. The parent's layout should get the preferred 1075 // There's no preferred width. The parent's layout should get the preferred
1076 // height from GetHeightForWidth(). 1076 // height from GetHeightForWidth().
1077 return gfx::Size(); 1077 return gfx::Size();
1078 } 1078 }
1079 1079
(...skipping 1262 matching lines...) Expand 10 before | Expand all | Expand 10 after
2342 AutofillDialogViews::DetailsGroup::DetailsGroup(DialogSection section) 2342 AutofillDialogViews::DetailsGroup::DetailsGroup(DialogSection section)
2343 : section(section), 2343 : section(section),
2344 container(NULL), 2344 container(NULL),
2345 manual_input(NULL), 2345 manual_input(NULL),
2346 suggested_info(NULL), 2346 suggested_info(NULL),
2347 suggested_button(NULL) {} 2347 suggested_button(NULL) {}
2348 2348
2349 AutofillDialogViews::DetailsGroup::~DetailsGroup() {} 2349 AutofillDialogViews::DetailsGroup::~DetailsGroup() {}
2350 2350
2351 } // namespace autofill 2351 } // namespace autofill
OLDNEW
« 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