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

Side by Side Diff: chrome/browser/views/options/advanced_contents_view.cc

Issue 113441: ChromeFont->gfx::Font... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: Created 11 years, 7 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
OLDNEW
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 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/views/options/advanced_contents_view.h" 5 #include "chrome/browser/views/options/advanced_contents_view.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 8
9 #include <cryptuiapi.h> 9 #include <cryptuiapi.h>
10 #pragma comment(lib, "cryptui.lib") 10 #pragma comment(lib, "cryptui.lib")
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 137
138 //////////////////////////////////////////////////////////////////////////////// 138 ////////////////////////////////////////////////////////////////////////////////
139 // AdvancedSection, public: 139 // AdvancedSection, public:
140 140
141 AdvancedSection::AdvancedSection(Profile* profile, 141 AdvancedSection::AdvancedSection(Profile* profile,
142 const std::wstring& title) 142 const std::wstring& title)
143 : contents_(NULL), 143 : contents_(NULL),
144 title_label_(new views::Label(title)), 144 title_label_(new views::Label(title)),
145 OptionsPageView(profile) { 145 OptionsPageView(profile) {
146 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 146 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
147 ChromeFont title_font = 147 gfx::Font title_font =
148 rb.GetFont(ResourceBundle::BaseFont).DeriveFont(0, ChromeFont::BOLD); 148 rb.GetFont(ResourceBundle::BaseFont).DeriveFont(0, gfx::Font::BOLD);
149 title_label_->SetFont(title_font); 149 title_label_->SetFont(title_font);
150 150
151 SkColor title_color = gfx::NativeTheme::instance()->GetThemeColorWithDefault( 151 SkColor title_color = gfx::NativeTheme::instance()->GetThemeColorWithDefault(
152 gfx::NativeTheme::BUTTON, BP_GROUPBOX, GBS_NORMAL, TMT_TEXTCOLOR, 152 gfx::NativeTheme::BUTTON, BP_GROUPBOX, GBS_NORMAL, TMT_TEXTCOLOR,
153 COLOR_WINDOWTEXT); 153 COLOR_WINDOWTEXT);
154 title_label_->SetColor(title_color); 154 title_label_->SetColor(title_color);
155 } 155 }
156 156
157 void AdvancedSection::DidChangeBounds(const gfx::Rect& previous, 157 void AdvancedSection::DidChangeBounds(const gfx::Rect& previous,
158 const gfx::Rect& current) { 158 const gfx::Rect& current) {
(...skipping 1015 matching lines...) Expand 10 before | Expand all | Expand 10 after
1174 1174
1175 void AdvancedScrollViewContainer::Layout() { 1175 void AdvancedScrollViewContainer::Layout() {
1176 gfx::Rect lb = GetLocalBounds(false); 1176 gfx::Rect lb = GetLocalBounds(false);
1177 1177
1178 gfx::Size border = gfx::NativeTheme::instance()->GetThemeBorderSize( 1178 gfx::Size border = gfx::NativeTheme::instance()->GetThemeBorderSize(
1179 gfx::NativeTheme::LIST); 1179 gfx::NativeTheme::LIST);
1180 lb.Inset(border.width(), border.height()); 1180 lb.Inset(border.width(), border.height());
1181 scroll_view_->SetBounds(lb); 1181 scroll_view_->SetBounds(lb);
1182 scroll_view_->Layout(); 1182 scroll_view_->Layout();
1183 } 1183 }
OLDNEW
« no previous file with comments | « chrome/browser/views/location_bar_view.cc ('k') | chrome/browser/views/options/fonts_page_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698