| OLD | NEW |
|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/favicon/chrome_fallback_icon_client.h" | 5 #include "chrome/browser/favicon/chrome_fallback_icon_client.h" |
| 6 | 6 |
| 7 #include "build/build_config.h" |
| 7 #include "grit/platform_locale_settings.h" | 8 #include "grit/platform_locale_settings.h" |
| 8 #include "ui/base/l10n/l10n_util.h" | 9 #include "ui/base/l10n/l10n_util.h" |
| 9 | 10 |
| 10 ChromeFallbackIconClient::ChromeFallbackIconClient() { | 11 ChromeFallbackIconClient::ChromeFallbackIconClient() { |
| 11 #if defined(OS_CHROMEOS) | 12 #if defined(OS_CHROMEOS) |
| 12 font_list_.push_back("Noto Sans"); | 13 font_list_.push_back("Noto Sans"); |
| 13 #elif defined(OS_IOS) | 14 #elif defined(OS_IOS) |
| 14 font_list_.push_back("Helvetica Neue"); | 15 font_list_.push_back("Helvetica Neue"); |
| 15 #else | 16 #else |
| 16 font_list_.push_back(l10n_util::GetStringUTF8(IDS_SANS_SERIF_FONT_FAMILY)); | 17 font_list_.push_back(l10n_util::GetStringUTF8(IDS_SANS_SERIF_FONT_FAMILY)); |
| 17 #endif | 18 #endif |
| 18 } | 19 } |
| 19 | 20 |
| 20 ChromeFallbackIconClient::~ChromeFallbackIconClient() { | 21 ChromeFallbackIconClient::~ChromeFallbackIconClient() { |
| 21 } | 22 } |
| 22 | 23 |
| 23 const std::vector<std::string>& ChromeFallbackIconClient::GetFontNameList() | 24 const std::vector<std::string>& ChromeFallbackIconClient::GetFontNameList() |
| 24 const { | 25 const { |
| 25 return font_list_; | 26 return font_list_; |
| 26 } | 27 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1550593002:
Switch to standard integer types in chrome/browser/, part 2 of 4. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master