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

Side by Side Diff: chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc

Issue 2480813003: Reduce views::Border creation verbosity by promoting factory functions (Closed)
Patch Set: fix bad merge Created 4 years, 1 month 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
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/extensions/media_galleries_dialog_views.h" 5 #include "chrome/browser/ui/views/extensions/media_galleries_dialog_views.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 views::GridLayout::FILL, views::GridLayout::LEADING, 120 views::GridLayout::FILL, views::GridLayout::LEADING,
121 dialog_content_width, subtext->GetHeightForWidth(dialog_content_width)); 121 dialog_content_width, subtext->GetHeightForWidth(dialog_content_width));
122 layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing); 122 layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
123 123
124 // Scrollable area for checkboxes. 124 // Scrollable area for checkboxes.
125 ScrollableView* scroll_container = new ScrollableView(); 125 ScrollableView* scroll_container = new ScrollableView();
126 scroll_container->SetLayoutManager(new views::BoxLayout( 126 scroll_container->SetLayoutManager(new views::BoxLayout(
127 views::BoxLayout::kVertical, 0, 0, 127 views::BoxLayout::kVertical, 0, 0,
128 views::kRelatedControlSmallVerticalSpacing)); 128 views::kRelatedControlSmallVerticalSpacing));
129 scroll_container->SetBorder( 129 scroll_container->SetBorder(
130 views::Border::CreateEmptyBorder(views::kRelatedControlVerticalSpacing, 130 views::CreateEmptyBorder(views::kRelatedControlVerticalSpacing, 0,
131 0, 131 views::kRelatedControlVerticalSpacing, 0));
132 views::kRelatedControlVerticalSpacing,
133 0));
134 132
135 std::vector<base::string16> section_headers = 133 std::vector<base::string16> section_headers =
136 controller_->GetSectionHeaders(); 134 controller_->GetSectionHeaders();
137 for (size_t i = 0; i < section_headers.size(); i++) { 135 for (size_t i = 0; i < section_headers.size(); i++) {
138 MediaGalleriesDialogController::Entries entries = 136 MediaGalleriesDialogController::Entries entries =
139 controller_->GetSectionEntries(i); 137 controller_->GetSectionEntries(i);
140 138
141 // Header and separator line. 139 // Header and separator line.
142 if (!section_headers[i].empty() && !entries.empty()) { 140 if (!section_headers[i].empty() && !entries.empty()) {
143 views::Separator* separator = new views::Separator( 141 views::Separator* separator = new views::Separator(
144 views::Separator::HORIZONTAL); 142 views::Separator::HORIZONTAL);
145 scroll_container->AddChildView(separator); 143 scroll_container->AddChildView(separator);
146 144
147 views::Label* header = new views::Label(section_headers[i]); 145 views::Label* header = new views::Label(section_headers[i]);
148 header->SetMultiLine(true); 146 header->SetMultiLine(true);
149 header->SetHorizontalAlignment(gfx::ALIGN_LEFT); 147 header->SetHorizontalAlignment(gfx::ALIGN_LEFT);
150 header->SetBorder(views::Border::CreateEmptyBorder( 148 header->SetBorder(views::CreateEmptyBorder(
151 views::kRelatedControlVerticalSpacing, 149 views::kRelatedControlVerticalSpacing, views::kPanelHorizMargin,
152 views::kPanelHorizMargin, 150 views::kRelatedControlVerticalSpacing, 0));
153 views::kRelatedControlVerticalSpacing,
154 0));
155 scroll_container->AddChildView(header); 151 scroll_container->AddChildView(header);
156 } 152 }
157 153
158 // Checkboxes. 154 // Checkboxes.
159 MediaGalleriesDialogController::Entries::const_iterator iter; 155 MediaGalleriesDialogController::Entries::const_iterator iter;
160 for (iter = entries.begin(); iter != entries.end(); ++iter) { 156 for (iter = entries.begin(); iter != entries.end(); ++iter) {
161 int spacing = 0; 157 int spacing = 0;
162 if (iter + 1 == entries.end()) 158 if (iter + 1 == entries.end())
163 spacing = views::kRelatedControlSmallVerticalSpacing; 159 spacing = views::kRelatedControlSmallVerticalSpacing;
164 AddOrUpdateGallery(*iter, scroll_container, spacing); 160 AddOrUpdateGallery(*iter, scroll_container, spacing);
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 context_menu_runner_.reset(); 321 context_menu_runner_.reset();
326 } 322 }
327 323
328 // MediaGalleriesDialogViewsController ----------------------------------------- 324 // MediaGalleriesDialogViewsController -----------------------------------------
329 325
330 // static 326 // static
331 MediaGalleriesDialog* MediaGalleriesDialog::Create( 327 MediaGalleriesDialog* MediaGalleriesDialog::Create(
332 MediaGalleriesDialogController* controller) { 328 MediaGalleriesDialogController* controller) {
333 return new MediaGalleriesDialogViews(controller); 329 return new MediaGalleriesDialogViews(controller);
334 } 330 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698