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

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

Issue 192017: Convert std::wstring encoding names to std::string in a bunch of files. (Closed)
Patch Set: mac and linux fixes Created 11 years, 3 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 4
5 #ifndef CHROME_BROWSER_VIEWS_OPTIONS_FONTS_PAGE_VIEW_H__ 5 #ifndef CHROME_BROWSER_VIEWS_OPTIONS_FONTS_PAGE_VIEW_H_
6 #define CHROME_BROWSER_VIEWS_OPTIONS_FONTS_PAGE_VIEW_H__ 6 #define CHROME_BROWSER_VIEWS_OPTIONS_FONTS_PAGE_VIEW_H_
7
8 #include <string>
7 9
8 #include "chrome/browser/views/options/options_page_view.h" 10 #include "chrome/browser/views/options/options_page_view.h"
9 #include "chrome/browser/shell_dialogs.h" 11 #include "chrome/browser/shell_dialogs.h"
10 #include "chrome/common/pref_member.h" 12 #include "chrome/common/pref_member.h"
11 #include "views/controls/combobox/combobox.h" 13 #include "views/controls/combobox/combobox.h"
12 #include "views/controls/button/button.h" 14 #include "views/controls/button/button.h"
13 #include "views/view.h" 15 #include "views/view.h"
14 16
15
16 namespace views { 17 namespace views {
17 class GroupboxView; 18 class GroupboxView;
18 class Label; 19 class Label;
19 class NativeButton; 20 class NativeButton;
20 class TableView; 21 class TableView;
21 } 22 }
22 23
23 class DefaultEncodingComboboxModel; 24 class DefaultEncodingComboboxModel;
24 class FontDisplayView; 25 class FontDisplayView;
25 class TableModel; 26 class TableModel;
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 StringPrefMember default_encoding_; 112 StringPrefMember default_encoding_;
112 bool font_changed_; 113 bool font_changed_;
113 114
114 // Windows font picker flag; 115 // Windows font picker flag;
115 FontTypeBeingChanged font_type_being_changed_; 116 FontTypeBeingChanged font_type_being_changed_;
116 117
117 // Default Encoding. 118 // Default Encoding.
118 scoped_ptr<DefaultEncodingComboboxModel> default_encoding_combobox_model_; 119 scoped_ptr<DefaultEncodingComboboxModel> default_encoding_combobox_model_;
119 views::Label* default_encoding_combobox_label_; 120 views::Label* default_encoding_combobox_label_;
120 views::Combobox* default_encoding_combobox_; 121 views::Combobox* default_encoding_combobox_;
121 std::wstring default_encoding_selected_; 122 std::string default_encoding_selected_;
122 bool default_encoding_changed_; 123 bool default_encoding_changed_;
123 124
124 DISALLOW_EVIL_CONSTRUCTORS(FontsPageView); 125 DISALLOW_COPY_AND_ASSIGN(FontsPageView);
125 }; 126 };
126 127
127 #endif // #ifndef CHROME_BROWSER_VIEWS_OPTIONS_FONTS_PAGE_VIEW_H__ 128 #endif // CHROME_BROWSER_VIEWS_OPTIONS_FONTS_PAGE_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/tab_contents/web_contents_unittest.cc ('k') | chrome/browser/views/toolbar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698