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

Side by Side Diff: chrome/browser/ui/views/extensions/bundle_installed_bubble.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 "base/i18n/rtl.h" 5 #include "base/i18n/rtl.h"
6 #include "base/utf_string_conversions.h" 6 #include "base/utf_string_conversions.h"
7 #include "chrome/browser/extensions/bundle_installer.h" 7 #include "chrome/browser/extensions/bundle_installer.h"
8 #include "chrome/browser/ui/browser.h" 8 #include "chrome/browser/ui/browser.h"
9 #include "chrome/browser/ui/views/frame/browser_view.h" 9 #include "chrome/browser/ui/views/frame/browser_view.h"
10 #include "chrome/browser/ui/views/toolbar_view.h" 10 #include "chrome/browser/ui/views/toolbar_view.h"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 void AddItemList(GridLayout* layout, const BundleInstaller::ItemList& items) { 108 void AddItemList(GridLayout* layout, const BundleInstaller::ItemList& items) {
109 for (size_t i = 0; i < items.size(); ++i) { 109 for (size_t i = 0; i < items.size(); ++i) {
110 string16 extension_name = UTF8ToUTF16(items[i].localized_name); 110 string16 extension_name = UTF8ToUTF16(items[i].localized_name);
111 base::i18n::AdjustStringForLocaleDirection(&extension_name); 111 base::i18n::AdjustStringForLocaleDirection(&extension_name);
112 layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing); 112 layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
113 layout->StartRow(0, kColumnSetId); 113 layout->StartRow(0, kColumnSetId);
114 views::Label* extension_label = new views::Label( 114 views::Label* extension_label = new views::Label(
115 l10n_util::GetStringFUTF16( 115 l10n_util::GetStringFUTF16(
116 IDS_EXTENSION_PERMISSION_LINE, extension_name)); 116 IDS_EXTENSION_PERMISSION_LINE, extension_name));
117 extension_label->SetMultiLine(true); 117 extension_label->SetMultiLine(true);
118 extension_label->SetHorizontalAlignment(views::Label::ALIGN_LEFT); 118 extension_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
119 extension_label->SizeToFit(kLeftColumnWidth); 119 extension_label->SizeToFit(kLeftColumnWidth);
120 layout->AddView(extension_label); 120 layout->AddView(extension_label);
121 } 121 }
122 } 122 }
123 123
124 void AddCloseButton(GridLayout* layout, views::ButtonListener* listener) { 124 void AddCloseButton(GridLayout* layout, views::ButtonListener* listener) {
125 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 125 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
126 126
127 views::ImageButton* button = new views::ImageButton(listener); 127 views::ImageButton* button = new views::ImageButton(listener);
128 button->SetImage(views::CustomButton::BS_NORMAL, 128 button->SetImage(views::CustomButton::BS_NORMAL,
129 rb.GetImageSkiaNamed(IDR_CLOSE_BAR)); 129 rb.GetImageSkiaNamed(IDR_CLOSE_BAR));
130 button->SetImage(views::CustomButton::BS_HOT, 130 button->SetImage(views::CustomButton::BS_HOT,
131 rb.GetImageSkiaNamed(IDR_CLOSE_BAR_H)); 131 rb.GetImageSkiaNamed(IDR_CLOSE_BAR_H));
132 button->SetImage(views::CustomButton::BS_PUSHED, 132 button->SetImage(views::CustomButton::BS_PUSHED,
133 rb.GetImageSkiaNamed(IDR_CLOSE_BAR_P)); 133 rb.GetImageSkiaNamed(IDR_CLOSE_BAR_P));
134 layout->AddView(button); 134 layout->AddView(button);
135 } 135 }
136 136
137 void AddHeading(GridLayout* layout, const string16& heading) { 137 void AddHeading(GridLayout* layout, const string16& heading) {
138 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 138 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
139 gfx::Font bold_font = rb.GetFont(ui::ResourceBundle::BaseFont).DeriveFont( 139 gfx::Font bold_font = rb.GetFont(ui::ResourceBundle::BaseFont).DeriveFont(
140 kHeadingFontSizeDelta, gfx::Font::BOLD); 140 kHeadingFontSizeDelta, gfx::Font::BOLD);
141 141
142 views::Label* heading_label = new views::Label(heading, bold_font); 142 views::Label* heading_label = new views::Label(heading, bold_font);
143 heading_label->SetMultiLine(true); 143 heading_label->SetMultiLine(true);
144 heading_label->SetHorizontalAlignment(views::Label::ALIGN_LEFT); 144 heading_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
145 heading_label->SizeToFit(kLeftColumnWidth); 145 heading_label->SizeToFit(kLeftColumnWidth);
146 layout->AddView(heading_label); 146 layout->AddView(heading_label);
147 } 147 }
148 148
149 // views::ButtonListener implementation: 149 // views::ButtonListener implementation:
150 virtual void ButtonPressed(views::Button* sender, 150 virtual void ButtonPressed(views::Button* sender,
151 const ui::Event& event) OVERRIDE { 151 const ui::Event& event) OVERRIDE {
152 StartFade(false); 152 StartFade(false);
153 } 153 }
154 154
155 DISALLOW_COPY_AND_ASSIGN(BundleInstalledBubble); 155 DISALLOW_COPY_AND_ASSIGN(BundleInstalledBubble);
156 }; 156 };
157 157
158 } // namespace 158 } // namespace
159 159
160 void BundleInstaller::ShowInstalledBubble( 160 void BundleInstaller::ShowInstalledBubble(
161 const BundleInstaller* bundle, Browser* browser) { 161 const BundleInstaller* bundle, Browser* browser) {
162 BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser); 162 BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser);
163 views::View* anchor = browser_view->GetToolbarView()->app_menu(); 163 views::View* anchor = browser_view->GetToolbarView()->app_menu();
164 new BundleInstalledBubble(bundle, anchor, views::BubbleBorder::TOP_RIGHT); 164 new BundleInstalledBubble(bundle, anchor, views::BubbleBorder::TOP_RIGHT);
165 } 165 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/edit_search_engine_dialog.cc ('k') | chrome/browser/ui/views/extensions/disabled_extensions_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698