OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/panels/panel_browser_frame_view.h" | 5 #include "chrome/browser/ui/panels/panel_browser_frame_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
10 #include "chrome/browser/themes/theme_service.h" | 10 #include "chrome/browser/themes/theme_service.h" |
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
273 l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE)); | 273 l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE)); |
274 AddChildView(close_button_); | 274 AddChildView(close_button_); |
275 | 275 |
276 title_icon_ = new TabIconView(this); | 276 title_icon_ = new TabIconView(this); |
277 title_icon_->set_is_light(true); | 277 title_icon_->set_is_light(true); |
278 AddChildView(title_icon_); | 278 AddChildView(title_icon_); |
279 title_icon_->Update(); | 279 title_icon_->Update(); |
280 | 280 |
281 title_label_ = new views::Label(string16()); | 281 title_label_ = new views::Label(string16()); |
282 title_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); | 282 title_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); |
| 283 title_label_->SetAutoColorReadabilityEnabled(false); |
283 AddChildView(title_label_); | 284 AddChildView(title_label_); |
284 | 285 |
285 mouse_watcher_.reset(new MouseWatcher(this)); | 286 mouse_watcher_.reset(new MouseWatcher(this)); |
286 } | 287 } |
287 | 288 |
288 PanelBrowserFrameView::~PanelBrowserFrameView() { | 289 PanelBrowserFrameView::~PanelBrowserFrameView() { |
289 } | 290 } |
290 | 291 |
291 gfx::Rect PanelBrowserFrameView::GetBoundsForTabStrip( | 292 gfx::Rect PanelBrowserFrameView::GetBoundsForTabStrip( |
292 views::View* tabstrip) const { | 293 views::View* tabstrip) const { |
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
580 } | 581 } |
581 | 582 |
582 void PanelBrowserFrameView::UpdateControlStyles(PaintState paint_state) { | 583 void PanelBrowserFrameView::UpdateControlStyles(PaintState paint_state) { |
583 DCHECK(paint_state != NOT_PAINTED); | 584 DCHECK(paint_state != NOT_PAINTED); |
584 | 585 |
585 if (paint_state == paint_state_) | 586 if (paint_state == paint_state_) |
586 return; | 587 return; |
587 paint_state_ = paint_state; | 588 paint_state_ = paint_state; |
588 | 589 |
589 SkColor title_color = GetTitleColor(paint_state_); | 590 SkColor title_color = GetTitleColor(paint_state_); |
590 title_label_->SetColor(title_color); | 591 title_label_->SetEnabledColor(title_color); |
591 title_label_->SetFont(*GetTitleFont()); | 592 title_label_->SetFont(*GetTitleFont()); |
592 | 593 |
593 close_button_->SetBackground(title_color, | 594 close_button_->SetBackground(title_color, |
594 close_button_resources.normal_image, | 595 close_button_resources.normal_image, |
595 close_button_resources.mask_image); | 596 close_button_resources.mask_image); |
596 } | 597 } |
597 | 598 |
598 void PanelBrowserFrameView::PaintFrameBorder(gfx::Canvas* canvas) { | 599 void PanelBrowserFrameView::PaintFrameBorder(gfx::Canvas* canvas) { |
599 SkBitmap* theme_frame = GetFrameTheme(paint_state_); | 600 SkBitmap* theme_frame = GetFrameTheme(paint_state_); |
600 | 601 |
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
742 | 743 |
743 settings_menu_model_.reset( | 744 settings_menu_model_.reset( |
744 new PanelSettingsMenuModel(browser_view_->panel())); | 745 new PanelSettingsMenuModel(browser_view_->panel())); |
745 settings_menu_adapter_.reset( | 746 settings_menu_adapter_.reset( |
746 new views::MenuModelAdapter(settings_menu_model_.get())); | 747 new views::MenuModelAdapter(settings_menu_model_.get())); |
747 settings_menu_ = new views::MenuItemView(settings_menu_adapter_.get()); | 748 settings_menu_ = new views::MenuItemView(settings_menu_adapter_.get()); |
748 settings_menu_adapter_->BuildMenu(settings_menu_); | 749 settings_menu_adapter_->BuildMenu(settings_menu_); |
749 settings_menu_runner_.reset(new views::MenuRunner(settings_menu_)); | 750 settings_menu_runner_.reset(new views::MenuRunner(settings_menu_)); |
750 return true; | 751 return true; |
751 } | 752 } |
OLD | NEW |