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

Side by Side Diff: chrome/browser/ui/views/find_bar_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/find_bar_view.h" 5 #include "chrome/browser/ui/views/find_bar_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/string_number_conversions.h" 9 #include "base/string_number_conversions.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 find_text_->set_id(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD); 84 find_text_->set_id(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD);
85 find_text_->SetFont(rb.GetFont(ui::ResourceBundle::BaseFont)); 85 find_text_->SetFont(rb.GetFont(ui::ResourceBundle::BaseFont));
86 find_text_->set_default_width_in_chars(kDefaultCharWidth); 86 find_text_->set_default_width_in_chars(kDefaultCharWidth);
87 find_text_->SetController(this); 87 find_text_->SetController(this);
88 find_text_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_FIND)); 88 find_text_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_FIND));
89 89
90 AddChildView(find_text_); 90 AddChildView(find_text_);
91 91
92 match_count_text_ = new views::Label(); 92 match_count_text_ = new views::Label();
93 match_count_text_->SetFont(rb.GetFont(ui::ResourceBundle::BaseFont)); 93 match_count_text_->SetFont(rb.GetFont(ui::ResourceBundle::BaseFont));
94 match_count_text_->SetHorizontalAlignment(views::Label::ALIGN_CENTER);
95 AddChildView(match_count_text_); 94 AddChildView(match_count_text_);
96 95
97 // Create a focus forwarder view which sends focus to find_text_. 96 // Create a focus forwarder view which sends focus to find_text_.
98 focus_forwarder_view_ = new FocusForwarderView(find_text_); 97 focus_forwarder_view_ = new FocusForwarderView(find_text_);
99 AddChildView(focus_forwarder_view_); 98 AddChildView(focus_forwarder_view_);
100 99
101 find_previous_button_ = new views::ImageButton(this); 100 find_previous_button_ = new views::ImageButton(this);
102 find_previous_button_->set_tag(FIND_PREVIOUS_TAG); 101 find_previous_button_->set_tag(FIND_PREVIOUS_TAG);
103 find_previous_button_->set_focusable(true); 102 find_previous_button_->set_focusable(true);
104 find_previous_button_->SetImage(views::CustomButton::BS_NORMAL, 103 find_previous_button_->SetImage(views::CustomButton::BS_NORMAL,
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 494
496 void FindBarView::OnThemeChanged() { 495 void FindBarView::OnThemeChanged() {
497 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 496 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
498 if (GetThemeProvider()) { 497 if (GetThemeProvider()) {
499 close_button_->SetBackground( 498 close_button_->SetBackground(
500 GetThemeProvider()->GetColor(ThemeService::COLOR_TAB_TEXT), 499 GetThemeProvider()->GetColor(ThemeService::COLOR_TAB_TEXT),
501 rb.GetImageSkiaNamed(IDR_TAB_CLOSE), 500 rb.GetImageSkiaNamed(IDR_TAB_CLOSE),
502 rb.GetImageSkiaNamed(IDR_TAB_CLOSE_MASK)); 501 rb.GetImageSkiaNamed(IDR_TAB_CLOSE_MASK));
503 } 502 }
504 } 503 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698