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

Side by Side Diff: chrome/browser/views/options/fonts_page_view.cc

Issue 115825: Move text_field.cc and rename the class to Textfield in preparation for porti... (Closed) Base URL: svn://chrome-svn/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 | Annotate | Revision Log
OLDNEW
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 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>
(...skipping 10 matching lines...) Expand all
21 #include "chrome/browser/browser_process.h" 21 #include "chrome/browser/browser_process.h"
22 #include "chrome/browser/character_encoding.h" 22 #include "chrome/browser/character_encoding.h"
23 #include "chrome/browser/shell_dialogs.h" 23 #include "chrome/browser/shell_dialogs.h"
24 #include "chrome/common/pref_names.h" 24 #include "chrome/common/pref_names.h"
25 #include "chrome/common/pref_service.h" 25 #include "chrome/common/pref_service.h"
26 #include "grit/generated_resources.h" 26 #include "grit/generated_resources.h"
27 #include "grit/theme_resources.h" 27 #include "grit/theme_resources.h"
28 #include "grit/locale_settings.h" 28 #include "grit/locale_settings.h"
29 #include "third_party/skia/include/core/SkBitmap.h" 29 #include "third_party/skia/include/core/SkBitmap.h"
30 #include "views/controls/button/native_button.h" 30 #include "views/controls/button/native_button.h"
31 #include "views/controls/text_field.h"
32 #include "views/grid_layout.h" 31 #include "views/grid_layout.h"
33 #include "views/standard_layout.h" 32 #include "views/standard_layout.h"
34 #include "views/widget/widget.h" 33 #include "views/widget/widget.h"
35 34
36 namespace { 35 namespace {
37 36
38 static std::vector<CharacterEncoding::EncodingInfo> sorted_encoding_list; 37 static std::vector<CharacterEncoding::EncodingInfo> sorted_encoding_list;
39 38
40 } // namespace 39 } // namespace
41 40
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); 488 column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
490 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, 489 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
491 GridLayout::USE_PREF, 0, 0); 490 GridLayout::USE_PREF, 0, 0);
492 491
493 // Add Encoding ComboBox. 492 // Add Encoding ComboBox.
494 layout->StartRow(0, double_column_view_set_id); 493 layout->StartRow(0, double_column_view_set_id);
495 layout->AddView(default_encoding_combobox_label_); 494 layout->AddView(default_encoding_combobox_label_);
496 layout->AddView(default_encoding_combobox_, 1, 1, GridLayout::FILL, 495 layout->AddView(default_encoding_combobox_, 1, 1, GridLayout::FILL,
497 GridLayout::CENTER); 496 GridLayout::CENTER);
498 } 497 }
OLDNEW
« no previous file with comments | « chrome/browser/views/options/cookies_view.cc ('k') | chrome/browser/views/options/general_page_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698