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

Unified Diff: chrome/browser/ui/views/find_bar_view.cc

Issue 10965042: Use new find in page resource on Windows too. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use same separator color on windows. Created 8 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/dropdown_bar_host.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/find_bar_view.cc
diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc
index a85c8a95dd0c9b0533eef3f0436c514cfd94b9ba..266397bafb8d5e1af2e5014669dc9d14ce856bf6 100644
--- a/chrome/browser/ui/views/find_bar_view.cc
+++ b/chrome/browser/ui/views/find_bar_view.cc
@@ -64,11 +64,6 @@ static const SkColor kBackgroundColorNoMatch = SkColorSetRGB(255, 102, 102);
// number brings the width on a "regular fonts" system to about 300px.
static const int kDefaultCharWidth = 43;
-#if defined(OS_CHROMEOS)
-// The background color of the find box.
-static const SkColor kFindBoxBackgroundColor = SkColorSetARGB(0, 255, 255, 255);
-#endif
-
////////////////////////////////////////////////////////////////////////////////
// FindBarView, public:
@@ -92,12 +87,6 @@ FindBarView::FindBarView(FindBarHost* host)
find_text_->SetController(this);
find_text_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_FIND));
-#if defined(OS_CHROMEOS)
- // Use a transparent background on ChromeOS as the theme image for the find
- // box uses a partially transparent background.
- find_text_->SetBackgroundColor(kFindBoxBackgroundColor);
-#endif
-
AddChildView(find_text_);
match_count_text_ = new views::Label();
@@ -146,21 +135,12 @@ FindBarView::FindBarView(FindBarHost* host)
close_button_ = new views::ImageButton(this);
close_button_->set_tag(CLOSE_TAG);
close_button_->set_focusable(true);
-#if defined(OS_CHROMEOS)
close_button_->SetImage(views::CustomButton::BS_NORMAL,
rb.GetImageSkiaNamed(IDR_TAB_CLOSE));
close_button_->SetImage(views::CustomButton::BS_HOT,
rb.GetImageSkiaNamed(IDR_TAB_CLOSE_H));
close_button_->SetImage(views::CustomButton::BS_PUSHED,
rb.GetImageSkiaNamed(IDR_TAB_CLOSE_P));
-#else
- close_button_->SetImage(views::CustomButton::BS_NORMAL,
- rb.GetImageSkiaNamed(IDR_CLOSE_BAR));
- close_button_->SetImage(views::CustomButton::BS_HOT,
- rb.GetImageSkiaNamed(IDR_CLOSE_BAR_H));
- close_button_->SetImage(views::CustomButton::BS_PUSHED,
- rb.GetImageSkiaNamed(IDR_CLOSE_BAR_P));
-#endif
close_button_->SetTooltipText(
l10n_util::GetStringUTF16(IDS_FIND_IN_PAGE_CLOSE_TOOLTIP));
close_button_->SetAccessibleName(
@@ -514,16 +494,9 @@ FindBarHost* FindBarView::find_bar_host() const {
void FindBarView::OnThemeChanged() {
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
if (GetThemeProvider()) {
-#if defined(OS_CHROMEOS)
close_button_->SetBackground(
GetThemeProvider()->GetColor(ThemeService::COLOR_TAB_TEXT),
rb.GetImageSkiaNamed(IDR_TAB_CLOSE),
rb.GetImageSkiaNamed(IDR_TAB_CLOSE_MASK));
-#else
- close_button_->SetBackground(
- GetThemeProvider()->GetColor(ThemeService::COLOR_TAB_TEXT),
- rb.GetImageSkiaNamed(IDR_CLOSE_BAR),
- rb.GetImageSkiaNamed(IDR_CLOSE_BAR_MASK));
-#endif
}
}
« no previous file with comments | « chrome/browser/ui/views/dropdown_bar_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698