| 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/options/fonts_page_view.h" | 5 #include "chrome/browser/views/options/fonts_page_view.h" |
| 6 | 6 |
| 7 #include <windows.h> | 7 #include <windows.h> |
| 8 #include <shlobj.h> | 8 #include <shlobj.h> |
| 9 #include <vsstyle.h> | 9 #include <vsstyle.h> |
| 10 #include <vssym32.h> | 10 #include <vssym32.h> |
| 11 | 11 |
| 12 #include <vector> | 12 #include <vector> |
| 13 | 13 |
| 14 #include "app/l10n_util.h" | 14 #include "app/l10n_util.h" |
| 15 #include "app/resource_bundle.h" | 15 #include "app/resource_bundle.h" |
| 16 #include "base/file_util.h" | 16 #include "base/file_util.h" |
| 17 #include "base/string_util.h" | 17 #include "base/string_util.h" |
| 18 #include "base/utf_string_conversions.h" | 18 #include "base/utf_string_conversions.h" |
| 19 #include "chrome/browser/default_encoding_combo_model.h" | 19 #include "chrome/browser/default_encoding_combo_model.h" |
| 20 #include "chrome/browser/prefs/pref_service.h" | 20 #include "chrome/browser/prefs/pref_service.h" |
| 21 #include "chrome/browser/profile.h" | 21 #include "chrome/browser/profiles/profile.h" |
| 22 #include "chrome/browser/shell_dialogs.h" | 22 #include "chrome/browser/shell_dialogs.h" |
| 23 #include "chrome/common/pref_names.h" | 23 #include "chrome/common/pref_names.h" |
| 24 #include "gfx/canvas_skia.h" | 24 #include "gfx/canvas_skia.h" |
| 25 #include "gfx/font.h" | 25 #include "gfx/font.h" |
| 26 #include "gfx/native_theme_win.h" | 26 #include "gfx/native_theme_win.h" |
| 27 #include "grit/generated_resources.h" | 27 #include "grit/generated_resources.h" |
| 28 #include "grit/theme_resources.h" | 28 #include "grit/theme_resources.h" |
| 29 #include "grit/locale_settings.h" | 29 #include "grit/locale_settings.h" |
| 30 #include "third_party/skia/include/core/SkBitmap.h" | 30 #include "third_party/skia/include/core/SkBitmap.h" |
| 31 #include "views/controls/button/native_button.h" | 31 #include "views/controls/button/native_button.h" |
| (...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 426 column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); | 426 column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); |
| 427 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, | 427 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, |
| 428 GridLayout::USE_PREF, 0, 0); | 428 GridLayout::USE_PREF, 0, 0); |
| 429 | 429 |
| 430 // Add Encoding Combobox. | 430 // Add Encoding Combobox. |
| 431 layout->StartRow(0, double_column_view_set_id); | 431 layout->StartRow(0, double_column_view_set_id); |
| 432 layout->AddView(default_encoding_combobox_label_); | 432 layout->AddView(default_encoding_combobox_label_); |
| 433 layout->AddView(default_encoding_combobox_, 1, 1, GridLayout::FILL, | 433 layout->AddView(default_encoding_combobox_, 1, 1, GridLayout::FILL, |
| 434 GridLayout::CENTER); | 434 GridLayout::CENTER); |
| 435 } | 435 } |
| OLD | NEW |