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

Side by Side Diff: chrome/browser/ui/views/find_bar_view.cc

Issue 9837059: Cleanup for views::Label: (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 9 months 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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 164
165 string16 FindBarView::GetFindText() const { 165 string16 FindBarView::GetFindText() const {
166 return find_text_->text(); 166 return find_text_->text();
167 } 167 }
168 168
169 string16 FindBarView::GetFindSelectedText() const { 169 string16 FindBarView::GetFindSelectedText() const {
170 return find_text_->GetSelectedText(); 170 return find_text_->GetSelectedText();
171 } 171 }
172 172
173 string16 FindBarView::GetMatchCountText() const { 173 string16 FindBarView::GetMatchCountText() const {
174 return match_count_text_->GetText(); 174 return match_count_text_->text();
175 } 175 }
176 176
177 void FindBarView::UpdateForResult(const FindNotificationDetails& result, 177 void FindBarView::UpdateForResult(const FindNotificationDetails& result,
178 const string16& find_text) { 178 const string16& find_text) {
179 bool have_valid_range = 179 bool have_valid_range =
180 result.number_of_matches() != -1 && result.active_match_ordinal() != -1; 180 result.number_of_matches() != -1 && result.active_match_ordinal() != -1;
181 181
182 // http://crbug.com/34970: some IMEs get confused if we change the text 182 // http://crbug.com/34970: some IMEs get confused if we change the text
183 // composed by them. To avoid this problem, we should check the IME status and 183 // composed by them. To avoid this problem, we should check the IME status and
184 // update the text only when the IME is not composing text. 184 // update the text only when the IME is not composing text.
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 484
485 void FindBarView::OnThemeChanged() { 485 void FindBarView::OnThemeChanged() {
486 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 486 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
487 if (GetThemeProvider()) { 487 if (GetThemeProvider()) {
488 close_button_->SetBackground( 488 close_button_->SetBackground(
489 GetThemeProvider()->GetColor(ThemeService::COLOR_TAB_TEXT), 489 GetThemeProvider()->GetColor(ThemeService::COLOR_TAB_TEXT),
490 rb.GetBitmapNamed(IDR_CLOSE_BAR), 490 rb.GetBitmapNamed(IDR_CLOSE_BAR),
491 rb.GetBitmapNamed(IDR_CLOSE_BAR_MASK)); 491 rb.GetBitmapNamed(IDR_CLOSE_BAR_MASK));
492 } 492 }
493 } 493 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/download/download_item_view.cc ('k') | chrome/browser/ui/views/generic_info_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698