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

Side by Side Diff: chrome/browser/ui/views/content_setting_bubble_contents.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/content_setting_bubble_contents.h" 5 #include "chrome/browser/ui/views/content_setting_bubble_contents.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 indented_single_column_set->AddPaddingColumn( 224 indented_single_column_set->AddPaddingColumn(
225 0, views::kPanelHorizIndentation); 225 0, views::kPanelHorizIndentation);
226 indented_single_column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 226 indented_single_column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL,
227 1, GridLayout::USE_PREF, 0, 0); 227 1, GridLayout::USE_PREF, 0, 0);
228 for (std::vector<ContentSettingBubbleModel::DomainList>::const_iterator i( 228 for (std::vector<ContentSettingBubbleModel::DomainList>::const_iterator i(
229 bubble_content.domain_lists.begin()); 229 bubble_content.domain_lists.begin());
230 i != bubble_content.domain_lists.end(); ++i) { 230 i != bubble_content.domain_lists.end(); ++i) {
231 layout->StartRow(0, single_column_set_id); 231 layout->StartRow(0, single_column_set_id);
232 views::Label* section_title = new views::Label(UTF8ToUTF16(i->title)); 232 views::Label* section_title = new views::Label(UTF8ToUTF16(i->title));
233 section_title->SetMultiLine(true); 233 section_title->SetMultiLine(true);
234 section_title->SetHorizontalAlignment(views::Label::ALIGN_LEFT); 234 section_title->SetHorizontalAlignment(gfx::ALIGN_LEFT);
235 layout->AddView(section_title, 1, 1, GridLayout::FILL, GridLayout::LEADING); 235 layout->AddView(section_title, 1, 1, GridLayout::FILL, GridLayout::LEADING);
236 for (std::set<std::string>::const_iterator j = i->hosts.begin(); 236 for (std::set<std::string>::const_iterator j = i->hosts.begin();
237 j != i->hosts.end(); ++j) { 237 j != i->hosts.end(); ++j) {
238 layout->StartRow(0, indented_single_column_set_id); 238 layout->StartRow(0, indented_single_column_set_id);
239 layout->AddView(new views::Label(UTF8ToUTF16(*j), domain_font)); 239 layout->AddView(new views::Label(UTF8ToUTF16(*j), domain_font));
240 } 240 }
241 bubble_content_empty = false; 241 bubble_content_empty = false;
242 } 242 }
243 243
244 if (!bubble_content.custom_link.empty()) { 244 if (!bubble_content.custom_link.empty()) {
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 } 319 }
320 320
321 void ContentSettingBubbleContents::Observe( 321 void ContentSettingBubbleContents::Observe(
322 int type, 322 int type,
323 const content::NotificationSource& source, 323 const content::NotificationSource& source,
324 const content::NotificationDetails& details) { 324 const content::NotificationDetails& details) {
325 DCHECK_EQ(content::NOTIFICATION_WEB_CONTENTS_DESTROYED, type); 325 DCHECK_EQ(content::NOTIFICATION_WEB_CONTENTS_DESTROYED, type);
326 DCHECK(source == content::Source<WebContents>(web_contents_)); 326 DCHECK(source == content::Source<WebContents>(web_contents_));
327 web_contents_ = NULL; 327 web_contents_ = NULL;
328 } 328 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698