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

Side by Side Diff: chrome/browser/gtk/tabs/tab_renderer_gtk.cc

Issue 3083022: Rework gfx::Font by moving platform-specific code into inner classes.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/gtk/tabs/tab_renderer_gtk.h ('k') | chrome/browser/remoting/setup_flow.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/gtk/tabs/tab_renderer_gtk.h" 5 #include "chrome/browser/gtk/tabs/tab_renderer_gtk.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
(...skipping 1060 matching lines...) Expand 10 before | Expand all | Expand 10 after
1071 void TabRendererGtk::InitResources() { 1071 void TabRendererGtk::InitResources() {
1072 if (initialized_) 1072 if (initialized_)
1073 return; 1073 return;
1074 1074
1075 LoadTabImages(); 1075 LoadTabImages();
1076 1076
1077 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 1077 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
1078 // Force the font size to 9pt, which matches Windows' default font size 1078 // Force the font size to 9pt, which matches Windows' default font size
1079 // (taken from the system). 1079 // (taken from the system).
1080 const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont); 1080 const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont);
1081 title_font_ = new gfx::Font(gfx::Font::CreateFont(base_font.FontName(), 9)); 1081 title_font_ = new gfx::Font(base_font.GetFontName(), 9);
1082 title_font_height_ = title_font_->height(); 1082 title_font_height_ = title_font_->GetHeight();
1083 1083
1084 crashed_fav_icon = rb.GetBitmapNamed(IDR_SAD_FAVICON); 1084 crashed_fav_icon = rb.GetBitmapNamed(IDR_SAD_FAVICON);
1085 1085
1086 initialized_ = true; 1086 initialized_ = true;
1087 } 1087 }
OLDNEW
« no previous file with comments | « chrome/browser/gtk/tabs/tab_renderer_gtk.h ('k') | chrome/browser/remoting/setup_flow.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698