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

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

Issue 24011: chrome_resources take 2 (Closed)
Patch Set: rebase Created 11 years, 10 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
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 #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 "chrome/browser/views/options/fonts_page_view.h" 9 #include "chrome/browser/views/options/fonts_page_view.h"
10 10
11 #include "base/file_util.h" 11 #include "base/file_util.h"
12 #include "base/gfx/native_theme.h" 12 #include "base/gfx/native_theme.h"
13 #include "base/string_util.h" 13 #include "base/string_util.h"
14 #include "chrome/app/theme/theme_resources.h" 14 #include "grit/theme_resources.h"
15 #include "chrome/app/locales/locale_settings.h" 15 #include "chrome/app/locales/locale_settings.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" 19 #include "chrome/browser/views/password_manager_view.h"
20 #include "chrome/browser/views/standard_layout.h" 20 #include "chrome/browser/views/standard_layout.h"
21 #include "chrome/common/gfx/chrome_canvas.h" 21 #include "chrome/common/gfx/chrome_canvas.h"
22 #include "chrome/common/gfx/chrome_font.h" 22 #include "chrome/common/gfx/chrome_font.h"
23 #include "chrome/common/l10n_util.h" 23 #include "chrome/common/l10n_util.h"
24 #include "chrome/common/pref_names.h" 24 #include "chrome/common/pref_names.h"
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, 471 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
472 GridLayout::USE_PREF, 0, 0); 472 GridLayout::USE_PREF, 0, 0);
473 473
474 // Add Encoding ComboBox. 474 // Add Encoding ComboBox.
475 layout->StartRow(0, double_column_view_set_id); 475 layout->StartRow(0, double_column_view_set_id);
476 layout->AddView(default_encoding_combobox_label_); 476 layout->AddView(default_encoding_combobox_label_);
477 layout->AddView(default_encoding_combobox_, 1, 1, GridLayout::FILL, 477 layout->AddView(default_encoding_combobox_, 1, 1, GridLayout::FILL,
478 GridLayout::CENTER); 478 GridLayout::CENTER);
479 } 479 }
480 480
OLDNEW
« no previous file with comments | « chrome/browser/views/options/cookies_view.cc ('k') | chrome/browser/views/options/general_page_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698