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

Side by Side Diff: chrome/browser/ui/views/web_intent_picker_views.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 <algorithm> 5 #include <algorithm>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/memory/scoped_vector.h" 8 #include "base/memory/scoped_vector.h"
9 #include "base/time.h" 9 #include "base/time.h"
10 #include "base/timer.h" 10 #include "base/timer.h"
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 rb.GetImageSkiaNamed(IDR_WEB_UI_CLOSE_HOVER)); 109 rb.GetImageSkiaNamed(IDR_WEB_UI_CLOSE_HOVER));
110 close_button->SetImage(views::CustomButton::BS_PUSHED, 110 close_button->SetImage(views::CustomButton::BS_PUSHED,
111 rb.GetImageSkiaNamed(IDR_WEB_UI_CLOSE_PRESSED)); 111 rb.GetImageSkiaNamed(IDR_WEB_UI_CLOSE_PRESSED));
112 return close_button; 112 return close_button;
113 } 113 }
114 114
115 // Creates a label. 115 // Creates a label.
116 views::Label* CreateLabel() { 116 views::Label* CreateLabel() {
117 views::Label* label = new views::Label(); 117 views::Label* label = new views::Label();
118 label->SetEnabledColor(kEnabledLabelColor); 118 label->SetEnabledColor(kEnabledLabelColor);
119 label->SetHorizontalAlignment(views::Label::ALIGN_LEFT); 119 label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
120 return label; 120 return label;
121 } 121 }
122 122
123 // Creates a title-style label. 123 // Creates a title-style label.
124 views::Label* CreateTitleLabel() { 124 views::Label* CreateTitleLabel() {
125 views::Label* label = CreateLabel(); 125 views::Label* label = CreateLabel();
126 label->SetFont(ui::ResourceBundle::GetSharedInstance().GetFont( 126 label->SetFont(ui::ResourceBundle::GetSharedInstance().GetFont(
127 ui::ResourceBundle::MediumFont)); 127 ui::ResourceBundle::MediumFont));
128 const int kLabelBuiltinTopPadding = 5; 128 const int kLabelBuiltinTopPadding = 5;
129 label->set_border(views::Border::CreateEmptyBorder( 129 label->set_border(views::Border::CreateEmptyBorder(
130 WebIntentPicker::kContentAreaBorder - 130 WebIntentPicker::kContentAreaBorder -
131 ConstrainedWindowConstants::kCloseButtonPadding - 131 ConstrainedWindowConstants::kCloseButtonPadding -
132 kLabelBuiltinTopPadding, 132 kLabelBuiltinTopPadding,
133 0, 0, 0)); 133 0, 0, 0));
134 return label; 134 return label;
135 } 135 }
136 136
137 // Creates a link. 137 // Creates a link.
138 views::Link* CreateLink() { 138 views::Link* CreateLink() {
139 views::Link* link = new views::Link(); 139 views::Link* link = new views::Link();
140 link->SetEnabledColor(kEnabledLinkColor); 140 link->SetEnabledColor(kEnabledLinkColor);
141 link->SetDisabledColor(kDisabledLinkColor); 141 link->SetDisabledColor(kDisabledLinkColor);
142 link->SetHorizontalAlignment(views::Label::ALIGN_LEFT); 142 link->SetHorizontalAlignment(gfx::ALIGN_LEFT);
143 return link; 143 return link;
144 } 144 }
145 145
146 // Creates a header for the inline disposition dialog. 146 // Creates a header for the inline disposition dialog.
147 views::View* CreateInlineDispositionHeader( 147 views::View* CreateInlineDispositionHeader(
148 views::ImageView* app_icon, 148 views::ImageView* app_icon,
149 views::Label* app_title, 149 views::Label* app_title,
150 views::Link* use_another_service_link) { 150 views::Link* use_another_service_link) {
151 views::View* header = new views::View(); 151 views::View* header = new views::View();
152 views::GridLayout* grid_layout = new views::GridLayout(header); 152 views::GridLayout* grid_layout = new views::GridLayout(header);
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 SpinnerProgressIndicator* throbber = new SpinnerProgressIndicator(); 497 SpinnerProgressIndicator* throbber = new SpinnerProgressIndicator();
498 layout->AddView(throbber); 498 layout->AddView(throbber);
499 499
500 // Message 500 // Message
501 const int kMessageBuiltinTopPadding = 5; 501 const int kMessageBuiltinTopPadding = 5;
502 layout->AddPaddingRow(0, 502 layout->AddPaddingRow(0,
503 ConstrainedWindowConstants::kRowPadding - 503 ConstrainedWindowConstants::kRowPadding -
504 kMessageBuiltinTopPadding); 504 kMessageBuiltinTopPadding);
505 layout->StartRow(0, CONTENT_ROW); 505 layout->StartRow(0, CONTENT_ROW);
506 views::Label* label = CreateLabel(); 506 views::Label* label = CreateLabel();
507 label->SetHorizontalAlignment(views::Label::ALIGN_CENTER); 507 label->SetHorizontalAlignment(gfx::ALIGN_CENTER);
508 label->SetText(l10n_util::GetStringUTF16(IDS_INTENT_PICKER_WAIT_FOR_CWS)); 508 label->SetText(l10n_util::GetStringUTF16(IDS_INTENT_PICKER_WAIT_FOR_CWS));
509 layout->AddView(label); 509 layout->AddView(label);
510 510
511 // Start the throbber. 511 // Start the throbber.
512 throbber->SetIndeterminate(true); 512 throbber->SetIndeterminate(true);
513 } 513 }
514 514
515 WaitingView::~WaitingView() { 515 WaitingView::~WaitingView() {
516 } 516 }
517 517
(...skipping 1077 matching lines...) Expand 10 before | Expand all | Expand 10 after
1595 if (inline_service) 1595 if (inline_service)
1596 inline_service_icon_->SetImage(inline_service->favicon.ToImageSkia()); 1596 inline_service_icon_->SetImage(inline_service->favicon.ToImageSkia());
1597 } 1597 }
1598 1598
1599 void WebIntentPickerViews::RefreshExtensions() { 1599 void WebIntentPickerViews::RefreshExtensions() {
1600 DCHECK(extensions_); 1600 DCHECK(extensions_);
1601 extensions_->Update(); 1601 extensions_->Update();
1602 contents_->Layout(); 1602 contents_->Layout();
1603 SizeToContents(); 1603 SizeToContents();
1604 } 1604 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/uninstall_view.cc ('k') | chrome/browser/ui/views/website_settings/website_settings_popup_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698