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

Side by Side Diff: chrome/browser/gtk/tabs/tab_renderer_gtk.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
« no previous file with comments | « chrome/browser/gtk/tabs/tab_renderer_gtk.h ('k') | chrome/browser/jsmessage_box_handler.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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/gtk/tabs/tab_renderer_gtk.h" 5 #include "chrome/browser/gtk/tabs/tab_renderer_gtk.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
9 #include "chrome/browser/browser.h" 9 #include "chrome/browser/browser.h"
10 #include "chrome/browser/browser_theme_provider.h" 10 #include "chrome/browser/browser_theme_provider.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 data->waiting_to_loading_frame_count_ratio = 5; 78 data->waiting_to_loading_frame_count_ratio = 5;
79 } 79 }
80 80
81 } // namespace 81 } // namespace
82 82
83 bool TabRendererGtk::initialized_ = false; 83 bool TabRendererGtk::initialized_ = false;
84 TabRendererGtk::TabImage TabRendererGtk::tab_active_ = {0}; 84 TabRendererGtk::TabImage TabRendererGtk::tab_active_ = {0};
85 TabRendererGtk::TabImage TabRendererGtk::tab_inactive_ = {0}; 85 TabRendererGtk::TabImage TabRendererGtk::tab_inactive_ = {0};
86 TabRendererGtk::TabImage TabRendererGtk::tab_alpha = {0}; 86 TabRendererGtk::TabImage TabRendererGtk::tab_alpha = {0};
87 TabRendererGtk::TabImage TabRendererGtk::tab_hover_ = {0}; 87 TabRendererGtk::TabImage TabRendererGtk::tab_hover_ = {0};
88 ChromeFont* TabRendererGtk::title_font_ = NULL; 88 gfx::Font* TabRendererGtk::title_font_ = NULL;
89 int TabRendererGtk::title_font_height_ = 0; 89 int TabRendererGtk::title_font_height_ = 0;
90 SkBitmap* TabRendererGtk::download_icon_ = NULL; 90 SkBitmap* TabRendererGtk::download_icon_ = NULL;
91 int TabRendererGtk::download_icon_width_ = 0; 91 int TabRendererGtk::download_icon_width_ = 0;
92 int TabRendererGtk::download_icon_height_ = 0; 92 int TabRendererGtk::download_icon_height_ = 0;
93 int TabRendererGtk::close_button_width_ = 0; 93 int TabRendererGtk::close_button_width_ = 0;
94 int TabRendererGtk::close_button_height_ = 0; 94 int TabRendererGtk::close_button_height_ = 0;
95 95
96 //////////////////////////////////////////////////////////////////////////////// 96 ////////////////////////////////////////////////////////////////////////////////
97 // TabRendererGtk::LoadingAnimation, public: 97 // TabRendererGtk::LoadingAnimation, public:
98 // 98 //
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 } 582 }
583 583
584 // static 584 // static
585 void TabRendererGtk::InitResources() { 585 void TabRendererGtk::InitResources() {
586 if (initialized_) 586 if (initialized_)
587 return; 587 return;
588 588
589 LoadTabImages(); 589 LoadTabImages();
590 590
591 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 591 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
592 title_font_ = new ChromeFont(rb.GetFont(ResourceBundle::BaseFont)); 592 title_font_ = new gfx::Font(rb.GetFont(ResourceBundle::BaseFont));
593 title_font_height_ = title_font_->height(); 593 title_font_height_ = title_font_->height();
594 594
595 InitializeLoadingAnimationData(&rb, &loading_animation_data); 595 InitializeLoadingAnimationData(&rb, &loading_animation_data);
596 596
597 initialized_ = true; 597 initialized_ = true;
598 } 598 }
OLDNEW
« no previous file with comments | « chrome/browser/gtk/tabs/tab_renderer_gtk.h ('k') | chrome/browser/jsmessage_box_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698