OLD | NEW |
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/views/tabs/base_tab.h" | 5 #include "chrome/browser/views/tabs/base_tab.h" |
6 | 6 |
7 #include <limits> | 7 #include <limits> |
8 | 8 |
9 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
10 #include "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
(...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
473 return crash_animation_.get() && crash_animation_->is_animating(); | 473 return crash_animation_.get() && crash_animation_->is_animating(); |
474 } | 474 } |
475 | 475 |
476 // static | 476 // static |
477 void BaseTab::InitResources() { | 477 void BaseTab::InitResources() { |
478 static bool initialized = false; | 478 static bool initialized = false; |
479 if (!initialized) { | 479 if (!initialized) { |
480 initialized = true; | 480 initialized = true; |
481 font_ = new gfx::Font( | 481 font_ = new gfx::Font( |
482 ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont)); | 482 ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont)); |
483 font_height_ = font_->height(); | 483 font_height_ = font_->GetHeight(); |
484 } | 484 } |
485 } | 485 } |
OLD | NEW |