Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 "ash/system/tray/tray_views.h" | 5 #include "ash/system/tray/tray_views.h" |
| 6 | 6 |
| 7 #include "ash/system/tray/tray_constants.h" | 7 #include "ash/system/tray/tray_constants.h" |
| 8 #include "grit/ash_strings.h" | 8 #include "grit/ash_strings.h" |
| 9 #include "grit/ui_resources_standard.h" | 9 #include "grit/ui_resources_standard.h" |
| 10 #include "grit/ui_resources_standard.h" | 10 #include "grit/ui_resources_standard.h" |
| (...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 417 void TrayPopupHeaderButton::StateChanged() { | 417 void TrayPopupHeaderButton::StateChanged() { |
| 418 SchedulePaint(); | 418 SchedulePaint(); |
| 419 } | 419 } |
| 420 | 420 |
| 421 //////////////////////////////////////////////////////////////////////////////// | 421 //////////////////////////////////////////////////////////////////////////////// |
| 422 // SpecialPopupRow | 422 // SpecialPopupRow |
| 423 | 423 |
| 424 SpecialPopupRow::SpecialPopupRow() | 424 SpecialPopupRow::SpecialPopupRow() |
| 425 : content_(NULL), | 425 : content_(NULL), |
| 426 button_container_(NULL) { | 426 button_container_(NULL) { |
| 427 set_background(views::Background::CreateBackgroundPainter(true, | 427 views::Background* background = views::Background::CreateBackgroundPainter( |
| 428 views::Painter::CreateVerticalGradient( | 428 true, views::Painter::CreateVerticalGradient( |
| 429 kHeaderBackgroundColorLight, | 429 kHeaderBackgroundColorLight, |
| 430 kHeaderBackgroundColorDark))); | 430 kHeaderBackgroundColorDark)); |
|
jennyz
2012/06/15 17:51:39
line 429 -430: Should have 2 more leading space fo
sadrul
2012/06/15 17:56:22
Done.
| |
| 431 background->SetNativeControlColor(kHeaderBackgroundColorDark); | |
| 432 set_background(background); | |
| 431 set_border(new SpecialPopupRowBorder); | 433 set_border(new SpecialPopupRowBorder); |
| 432 SetLayoutManager( | 434 SetLayoutManager( |
| 433 new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0)); | 435 new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0)); |
| 434 } | 436 } |
| 435 | 437 |
| 436 SpecialPopupRow::~SpecialPopupRow() { | 438 SpecialPopupRow::~SpecialPopupRow() { |
| 437 } | 439 } |
| 438 | 440 |
| 439 void SpecialPopupRow::SetTextLabel(int string_id, ViewClickListener* listener) { | 441 void SpecialPopupRow::SetTextLabel(int string_id, ViewClickListener* listener) { |
| 440 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); | 442 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 599 label->SetAutoColorReadabilityEnabled(false); | 601 label->SetAutoColorReadabilityEnabled(false); |
| 600 label->SetEnabledColor(SK_ColorWHITE); | 602 label->SetEnabledColor(SK_ColorWHITE); |
| 601 label->SetBackgroundColor(SkColorSetARGB(0, 255, 255, 255)); | 603 label->SetBackgroundColor(SkColorSetARGB(0, 255, 255, 255)); |
| 602 label->SetShadowColors(SkColorSetARGB(64, 0, 0, 0), | 604 label->SetShadowColors(SkColorSetARGB(64, 0, 0, 0), |
| 603 SkColorSetARGB(64, 0, 0, 0)); | 605 SkColorSetARGB(64, 0, 0, 0)); |
| 604 label->SetShadowOffset(0, 1); | 606 label->SetShadowOffset(0, 1); |
| 605 } | 607 } |
| 606 | 608 |
| 607 } // namespace internal | 609 } // namespace internal |
| 608 } // namespace ash | 610 } // namespace ash |
| OLD | NEW |