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 642 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
653 | 653 |
654 gfx::Size PanelBrowserFrameView::NonClientAreaSize() const { | 654 gfx::Size PanelBrowserFrameView::NonClientAreaSize() const { |
655 return gfx::Size(NonClientBorderThickness() * 2, | 655 return gfx::Size(NonClientBorderThickness() * 2, |
656 NonClientTopBorderHeight() + NonClientBorderThickness()); | 656 NonClientTopBorderHeight() + NonClientBorderThickness()); |
657 } | 657 } |
658 | 658 |
659 int PanelBrowserFrameView::IconOnlyWidth() const { | 659 int PanelBrowserFrameView::IconOnlyWidth() const { |
660 return kBorderThickness * 2 + kIconAndBorderSpacing * 2 + kIconSize; | 660 return kBorderThickness * 2 + kIconAndBorderSpacing * 2 + kIconSize; |
661 } | 661 } |
662 | 662 |
663 gfx::Size PanelBrowserFrameView::IconifiedSize() const { | 663 gfx::Size PanelBrowserFrameView::IconOnlySize() const { |
664 return gfx::Size(IconOnlyWidth(), NonClientTopBorderHeight()); | 664 return gfx::Size(IconOnlyWidth(), NonClientTopBorderHeight()); |
665 } | 665 } |
666 | 666 |
667 bool PanelBrowserFrameView::UsingDefaultTheme() const { | 667 bool PanelBrowserFrameView::UsingDefaultTheme() const { |
668 ThemeService* theme_service = ThemeServiceFactory::GetForProfile( | 668 ThemeService* theme_service = ThemeServiceFactory::GetForProfile( |
669 panel_browser_view_->panel()->browser()->profile()); | 669 panel_browser_view_->panel()->browser()->profile()); |
670 return theme_service->UsingDefaultTheme(); | 670 return theme_service->UsingDefaultTheme(); |
671 } | 671 } |
672 | 672 |
673 gfx::Size PanelBrowserFrameView::IconifiedSize() const { | |
Dmitry Titov
2011/12/02 01:56:20
Is this the same as IconOnlySize?
| |
674 return gfx::Size(IconOnlyWidth(), NonClientTopBorderHeight()); | |
675 } | |
676 | |
673 SkColor PanelBrowserFrameView::GetDefaultTitleColor( | 677 SkColor PanelBrowserFrameView::GetDefaultTitleColor( |
674 PaintState paint_state) const { | 678 PaintState paint_state) const { |
675 switch (paint_state) { | 679 switch (paint_state) { |
676 case PAINT_AS_INACTIVE: | 680 case PAINT_AS_INACTIVE: |
677 return kActiveTitleTextDefaultColor; | 681 return kActiveTitleTextDefaultColor; |
678 case PAINT_AS_ACTIVE: | 682 case PAINT_AS_ACTIVE: |
679 return kInactiveTitleTextDefaultColor; | 683 return kInactiveTitleTextDefaultColor; |
680 case PAINT_FOR_ATTENTION: | 684 case PAINT_FOR_ATTENTION: |
681 return kAttentionTitleTextDefaultColor; | 685 return kAttentionTitleTextDefaultColor; |
682 default: | 686 default: |
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
863 | 867 |
864 settings_menu_model_.reset( | 868 settings_menu_model_.reset( |
865 new PanelSettingsMenuModel(panel_browser_view_->panel())); | 869 new PanelSettingsMenuModel(panel_browser_view_->panel())); |
866 settings_menu_adapter_.reset( | 870 settings_menu_adapter_.reset( |
867 new views::MenuModelAdapter(settings_menu_model_.get())); | 871 new views::MenuModelAdapter(settings_menu_model_.get())); |
868 settings_menu_ = new views::MenuItemView(settings_menu_adapter_.get()); | 872 settings_menu_ = new views::MenuItemView(settings_menu_adapter_.get()); |
869 settings_menu_adapter_->BuildMenu(settings_menu_); | 873 settings_menu_adapter_->BuildMenu(settings_menu_); |
870 settings_menu_runner_.reset(new views::MenuRunner(settings_menu_)); | 874 settings_menu_runner_.reset(new views::MenuRunner(settings_menu_)); |
871 return true; | 875 return true; |
872 } | 876 } |
OLD | NEW |