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

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

Issue 11377005: Replace Label::Alignment with gfx::HorizontalAlignment (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix remaining Label::Alignment references. Created 8 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 | Annotate | Revision Log
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/disabled_extensions_view.h" 5 #include "chrome/browser/ui/views/extensions/disabled_extensions_view.h"
6 6
7 #include "base/metrics/histogram.h" 7 #include "base/metrics/histogram.h"
8 #include "base/string_number_conversions.h" 8 #include "base/string_number_conversions.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 views::ColumnSet* upper_columns = layout->AddColumnSet(text_column_set_id); 221 views::ColumnSet* upper_columns = layout->AddColumnSet(text_column_set_id);
222 upper_columns->AddPaddingColumn(0, left_padding_column); 222 upper_columns->AddPaddingColumn(0, left_padding_column);
223 upper_columns->AddPaddingColumn(0, kColumnPadding); 223 upper_columns->AddPaddingColumn(0, kColumnPadding);
224 upper_columns->AddColumn( 224 upper_columns->AddColumn(
225 views::GridLayout::LEADING, views::GridLayout::LEADING, 225 views::GridLayout::LEADING, views::GridLayout::LEADING,
226 0, views::GridLayout::USE_PREF, 0, 0); 226 0, views::GridLayout::USE_PREF, 0, 0);
227 layout->StartRow(0, text_column_set_id); 227 layout->StartRow(0, text_column_set_id);
228 228
229 views::Label* message = new views::Label(); 229 views::Label* message = new views::Label();
230 message->SetMultiLine(true); 230 message->SetMultiLine(true);
231 message->SetHorizontalAlignment(views::Label::ALIGN_LEFT); 231 message->SetHorizontalAlignment(gfx::ALIGN_LEFT);
232 message->SetText( 232 message->SetText(
233 l10n_util::GetStringUTF16(IDS_OPTIONS_SIDELOAD_WIPEOUT_WHAT_HAPPENED)); 233 l10n_util::GetStringUTF16(IDS_OPTIONS_SIDELOAD_WIPEOUT_WHAT_HAPPENED));
234 message->SizeToFit(views::Widget::GetLocalizedContentsWidth( 234 message->SizeToFit(views::Widget::GetLocalizedContentsWidth(
235 IDS_DISABLED_EXTENSIONS_BUBBLE_WIDTH_CHARS)); 235 IDS_DISABLED_EXTENSIONS_BUBBLE_WIDTH_CHARS));
236 layout->AddView(message); 236 layout->AddView(message);
237 237
238 const int extension_list_column_set_id = 2; 238 const int extension_list_column_set_id = 2;
239 views::ColumnSet* middle_columns = 239 views::ColumnSet* middle_columns =
240 layout->AddColumnSet(extension_list_column_set_id); 240 layout->AddColumnSet(extension_list_column_set_id);
241 middle_columns->AddPaddingColumn(0, left_padding_column); 241 middle_columns->AddPaddingColumn(0, left_padding_column);
242 middle_columns->AddPaddingColumn(0, kExtensionListPadding); 242 middle_columns->AddPaddingColumn(0, kExtensionListPadding);
243 middle_columns->AddColumn( 243 middle_columns->AddColumn(
244 views::GridLayout::LEADING, views::GridLayout::CENTER, 244 views::GridLayout::LEADING, views::GridLayout::CENTER,
245 0, views::GridLayout::USE_PREF, 0, 0); 245 0, views::GridLayout::USE_PREF, 0, 0);
246 246
247 layout->StartRowWithPadding(0, extension_list_column_set_id, 247 layout->StartRowWithPadding(0, extension_list_column_set_id,
248 0, kHeadlineMessagePadding); 248 0, kHeadlineMessagePadding);
249 views::Label* extensions = new views::Label(); 249 views::Label* extensions = new views::Label();
250 extensions->SetMultiLine(true); 250 extensions->SetMultiLine(true);
251 extensions->SetHorizontalAlignment(views::Label::ALIGN_LEFT); 251 extensions->SetHorizontalAlignment(gfx::ALIGN_LEFT);
252 extensions->SetFont(extensions->font().DeriveFont(0, gfx::Font::ITALIC)); 252 extensions->SetFont(extensions->font().DeriveFont(0, gfx::Font::ITALIC));
253 253
254 std::vector<string16> extension_list; 254 std::vector<string16> extension_list;
255 int count = 0; 255 int count = 0;
256 for (ExtensionSet::const_iterator iter = wiped_out_->begin(); 256 for (ExtensionSet::const_iterator iter = wiped_out_->begin();
257 iter != wiped_out_->end() && count < kMaxExtensionsToShow; ++iter) { 257 iter != wiped_out_->end() && count < kMaxExtensionsToShow; ++iter) {
258 const extensions::Extension* extension = *iter; 258 const extensions::Extension* extension = *iter;
259 extension_list.push_back(ASCIIToUTF16("- ") + 259 extension_list.push_back(ASCIIToUTF16("- ") +
260 UTF8ToUTF16(extension->name())); 260 UTF8ToUTF16(extension->name()));
261 count++; 261 count++;
262 } 262 }
263 263
264 if (count == kMaxExtensionsToShow) { 264 if (count == kMaxExtensionsToShow) {
265 string16 difference = 265 string16 difference =
266 base::IntToString16(wiped_out_->size() - kMaxExtensionsToShow); 266 base::IntToString16(wiped_out_->size() - kMaxExtensionsToShow);
267 extension_list.push_back(ASCIIToUTF16("- ") + 267 extension_list.push_back(ASCIIToUTF16("- ") +
268 l10n_util::GetStringFUTF16(IDS_OPTIONS_SIDELOAD_WIPEOUT_OVERFLOW, 268 l10n_util::GetStringFUTF16(IDS_OPTIONS_SIDELOAD_WIPEOUT_OVERFLOW,
269 difference)); 269 difference));
270 } 270 }
271 271
272 extensions->SetText(JoinString(extension_list, ASCIIToUTF16("\n"))); 272 extensions->SetText(JoinString(extension_list, ASCIIToUTF16("\n")));
273 extensions->SizeToFit(views::Widget::GetLocalizedContentsWidth( 273 extensions->SizeToFit(views::Widget::GetLocalizedContentsWidth(
274 IDS_DISABLED_EXTENSIONS_BUBBLE_WIDTH_CHARS)); 274 IDS_DISABLED_EXTENSIONS_BUBBLE_WIDTH_CHARS));
275 layout->AddView(extensions); 275 layout->AddView(extensions);
276 276
277 layout->StartRowWithPadding( 277 layout->StartRowWithPadding(
278 0, text_column_set_id, 0, kHeadlineMessagePadding); 278 0, text_column_set_id, 0, kHeadlineMessagePadding);
279 views::Label* recourse = new views::Label(); 279 views::Label* recourse = new views::Label();
280 recourse->SetMultiLine(true); 280 recourse->SetMultiLine(true);
281 recourse->SetHorizontalAlignment(views::Label::ALIGN_LEFT); 281 recourse->SetHorizontalAlignment(gfx::ALIGN_LEFT);
282 recourse->SetText( 282 recourse->SetText(
283 l10n_util::GetStringUTF16(IDS_OPTIONS_SIDELOAD_WIPEOUT_RECOURSE)); 283 l10n_util::GetStringUTF16(IDS_OPTIONS_SIDELOAD_WIPEOUT_RECOURSE));
284 recourse->SizeToFit(views::Widget::GetLocalizedContentsWidth( 284 recourse->SizeToFit(views::Widget::GetLocalizedContentsWidth(
285 IDS_DISABLED_EXTENSIONS_BUBBLE_WIDTH_CHARS)); 285 IDS_DISABLED_EXTENSIONS_BUBBLE_WIDTH_CHARS));
286 layout->AddView(recourse); 286 layout->AddView(recourse);
287 287
288 const int action_row_column_set_id = 3; 288 const int action_row_column_set_id = 3;
289 views::ColumnSet* bottom_columns = 289 views::ColumnSet* bottom_columns =
290 layout->AddColumnSet(action_row_column_set_id); 290 layout->AddColumnSet(action_row_column_set_id);
291 bottom_columns->AddPaddingColumn(0, left_padding_column); 291 bottom_columns->AddPaddingColumn(0, left_padding_column);
(...skipping 19 matching lines...) Expand all
311 layout->AddView(settings_button_); 311 layout->AddView(settings_button_);
312 dismiss_button_ = new views::NativeTextButton(this, 312 dismiss_button_ = new views::NativeTextButton(this,
313 l10n_util::GetStringUTF16(IDS_OPTIONS_SIDELOAD_WIPEOUT_DISMISS)); 313 l10n_util::GetStringUTF16(IDS_OPTIONS_SIDELOAD_WIPEOUT_DISMISS));
314 dismiss_button_->SetFont( 314 dismiss_button_->SetFont(
315 dismiss_button_->font().DeriveFont(0, gfx::Font::BOLD)); 315 dismiss_button_->font().DeriveFont(0, gfx::Font::BOLD));
316 layout->AddView(dismiss_button_); 316 layout->AddView(dismiss_button_);
317 317
318 content::RecordAction( 318 content::RecordAction(
319 UserMetricsAction("DisabledExtensionNotificationShown")); 319 UserMetricsAction("DisabledExtensionNotificationShown"));
320 } 320 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698