| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 #include <windows.h> | 4 #include <windows.h> |
| 5 #include <shlobj.h> | 5 #include <shlobj.h> |
| 6 #include <vsstyle.h> | 6 #include <vsstyle.h> |
| 7 #include <vssym32.h> | 7 #include <vssym32.h> |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "chrome/browser/views/options/fonts_page_view.h" | 11 #include "chrome/browser/views/options/fonts_page_view.h" |
| 12 | 12 |
| 13 #include "base/file_util.h" | 13 #include "base/file_util.h" |
| 14 #include "base/gfx/native_theme.h" | 14 #include "base/gfx/native_theme.h" |
| 15 #include "base/string_util.h" | 15 #include "base/string_util.h" |
| 16 #include "chrome/browser/browser_process.h" | 16 #include "chrome/browser/browser_process.h" |
| 17 #include "chrome/browser/character_encoding.h" | 17 #include "chrome/browser/character_encoding.h" |
| 18 #include "chrome/browser/shell_dialogs.h" | 18 #include "chrome/browser/shell_dialogs.h" |
| 19 #include "chrome/browser/views/password_manager_view.h" | |
| 20 #include "chrome/browser/views/standard_layout.h" | 19 #include "chrome/browser/views/standard_layout.h" |
| 21 #include "chrome/common/gfx/chrome_canvas.h" | 20 #include "chrome/common/gfx/chrome_canvas.h" |
| 22 #include "chrome/common/gfx/chrome_font.h" | 21 #include "chrome/common/gfx/chrome_font.h" |
| 23 #include "chrome/common/l10n_util.h" | 22 #include "chrome/common/l10n_util.h" |
| 24 #include "chrome/common/pref_names.h" | 23 #include "chrome/common/pref_names.h" |
| 25 #include "chrome/common/pref_service.h" | 24 #include "chrome/common/pref_service.h" |
| 26 #include "chrome/common/resource_bundle.h" | 25 #include "chrome/common/resource_bundle.h" |
| 27 #include "chrome/views/controls/button/native_button.h" | 26 #include "chrome/views/controls/button/native_button.h" |
| 28 #include "chrome/views/controls/text_field.h" | 27 #include "chrome/views/controls/text_field.h" |
| 29 #include "chrome/views/grid_layout.h" | 28 #include "chrome/views/grid_layout.h" |
| (...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 395 IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_SERIF_LABEL)); | 394 IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_SERIF_LABEL)); |
| 396 serif_font_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); | 395 serif_font_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); |
| 397 serif_font_label_->SetMultiLine(true); | 396 serif_font_label_->SetMultiLine(true); |
| 398 | 397 |
| 399 // Sans Serif font. | 398 // Sans Serif font. |
| 400 sans_serif_font_display_view_ = new FontDisplayView; | 399 sans_serif_font_display_view_ = new FontDisplayView; |
| 401 sans_serif_font_change_page_button_ = new views::NativeButton( | 400 sans_serif_font_change_page_button_ = new views::NativeButton( |
| 402 this, | 401 this, |
| 403 l10n_util::GetString( | 402 l10n_util::GetString( |
| 404 IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_BUTTON_LABEL)); | 403 IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_BUTTON_LABEL)); |
| 405 | 404 |
| 406 sans_serif_font_label_ = new views::Label( | 405 sans_serif_font_label_ = new views::Label( |
| 407 l10n_util::GetString( | 406 l10n_util::GetString( |
| 408 IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_SANS_SERIF_LABEL)); | 407 IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_SANS_SERIF_LABEL)); |
| 409 sans_serif_font_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); | 408 sans_serif_font_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); |
| 410 sans_serif_font_label_->SetMultiLine(true); | 409 sans_serif_font_label_->SetMultiLine(true); |
| 411 | 410 |
| 412 // Now add the views. | 411 // Now add the views. |
| 413 using views::GridLayout; | 412 using views::GridLayout; |
| 414 using views::ColumnSet; | 413 using views::ColumnSet; |
| 415 | 414 |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 486 column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); | 485 column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); |
| 487 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, | 486 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, |
| 488 GridLayout::USE_PREF, 0, 0); | 487 GridLayout::USE_PREF, 0, 0); |
| 489 | 488 |
| 490 // Add Encoding ComboBox. | 489 // Add Encoding ComboBox. |
| 491 layout->StartRow(0, double_column_view_set_id); | 490 layout->StartRow(0, double_column_view_set_id); |
| 492 layout->AddView(default_encoding_combobox_label_); | 491 layout->AddView(default_encoding_combobox_label_); |
| 493 layout->AddView(default_encoding_combobox_, 1, 1, GridLayout::FILL, | 492 layout->AddView(default_encoding_combobox_, 1, 1, GridLayout::FILL, |
| 494 GridLayout::CENTER); | 493 GridLayout::CENTER); |
| 495 } | 494 } |
| OLD | NEW |