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

Unified 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/options/fonts_page_view.h
diff --git a/chrome/browser/views/options/fonts_page_view.h b/chrome/browser/views/options/fonts_page_view.h
index d85d8ff60d25506de9d4942b3f7392e97849db92..193a5e7b86689c58538a9d1d1c70ff361e3f668b 100644
--- a/chrome/browser/views/options/fonts_page_view.h
+++ b/chrome/browser/views/options/fonts_page_view.h
@@ -2,8 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_VIEWS_OPTIONS_FONTS_PAGE_VIEW_H__
-#define CHROME_BROWSER_VIEWS_OPTIONS_FONTS_PAGE_VIEW_H__
+#ifndef CHROME_BROWSER_VIEWS_OPTIONS_FONTS_PAGE_VIEW_H_
+#define CHROME_BROWSER_VIEWS_OPTIONS_FONTS_PAGE_VIEW_H_
+
+#include <string>
#include "chrome/browser/views/options/options_page_view.h"
#include "chrome/browser/shell_dialogs.h"
@@ -12,7 +14,6 @@
#include "views/controls/button/button.h"
#include "views/view.h"
-
namespace views {
class GroupboxView;
class Label;
@@ -118,10 +119,10 @@ class FontsPageView : public OptionsPageView,
scoped_ptr<DefaultEncodingComboboxModel> default_encoding_combobox_model_;
views::Label* default_encoding_combobox_label_;
views::Combobox* default_encoding_combobox_;
- std::wstring default_encoding_selected_;
+ std::string default_encoding_selected_;
bool default_encoding_changed_;
- DISALLOW_EVIL_CONSTRUCTORS(FontsPageView);
+ DISALLOW_COPY_AND_ASSIGN(FontsPageView);
};
-#endif // #ifndef CHROME_BROWSER_VIEWS_OPTIONS_FONTS_PAGE_VIEW_H__
+#endif // CHROME_BROWSER_VIEWS_OPTIONS_FONTS_PAGE_VIEW_H_
« 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