diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-04 22:23:40 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-04 22:23:40 +0000 |
| commit | 41fc0320689c888625b5f13b5540a85590d6f830 (patch) | |
| tree | 121dc85682d85da5eb8ff3ef645985a9bb61d635 /chrome/browser/encoding_menu_controller.h | |
| parent | fe2c7f0cb1d2513e357f3c840bb1aa00739aafdf (diff) | |
| download | chromium_src-41fc0320689c888625b5f13b5540a85590d6f830.zip chromium_src-41fc0320689c888625b5f13b5540a85590d6f830.tar.gz chromium_src-41fc0320689c888625b5f13b5540a85590d6f830.tar.bz2 | |
Convert std::wstring encoding names to std::string in a bunch of files.
BUG=8647 (http://crbug.com/8647)
TEST=run unit_tests.exe and ui_tests.exe
Original patch by Thiago Farina <thiago.farina@gmail.com> at
http://codereview.chromium.org/179057/show
Some linux related fixes by me.
Review URL: http://codereview.chromium.org/192017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25529 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/encoding_menu_controller.h')
| -rw-r--r-- | chrome/browser/encoding_menu_controller.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/chrome/browser/encoding_menu_controller.h b/chrome/browser/encoding_menu_controller.h index 24eab64..d362f68 100644 --- a/chrome/browser/encoding_menu_controller.h +++ b/chrome/browser/encoding_menu_controller.h @@ -2,13 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHORME_BROWSER_ENCODING_MENU_CONTROLLER_H_ -#define CHORME_BROWSER_ENCODING_MENU_CONTROLLER_H_ +#ifndef CHROME_BROWSER_ENCODING_MENU_CONTROLLER_H_ +#define CHROME_BROWSER_ENCODING_MENU_CONTROLLER_H_ +#include <utility> #include <string> #include <vector> -#include "base/basictypes.h" // For DISALLOW_IMPLICIT_CONSTRUCTORS +#include "base/basictypes.h" // For DISALLOW_COPY_AND_ASSIGN +#include "base/string16.h" #include "testing/gtest/include/gtest/gtest_prod.h" // For FRIEND_TEST class Browser; @@ -21,7 +23,7 @@ class EncodingMenuController { FRIEND_TEST(EncodingMenuControllerTest, IsItemChecked); public: - typedef std::pair<int, std::wstring> EncodingMenuItem; + typedef std::pair<int, string16> EncodingMenuItem; typedef std::vector<EncodingMenuItem> EncodingMenuItemList; public: @@ -34,7 +36,7 @@ class EncodingMenuController { // is checked. Note that this header is included from objc, where the name // "id" is reserved. bool IsItemChecked(Profile* browser_profile, - const std::wstring& current_tab_encoding, + const std::string& current_tab_encoding, int item_id); // Fills in a list of menu items in the order they should appear in the menu. @@ -47,8 +49,8 @@ class EncodingMenuController { static const int kValidEncodingIds[]; const int* ValidGUIEncodingIDs(); int NumValidGUIEncodingIDs(); - private: + DISALLOW_COPY_AND_ASSIGN(EncodingMenuController); }; -#endif // CHORME_BROWSER_ENCODING_MENU_CONTROLLER_H_ +#endif // CHROME_BROWSER_ENCODING_MENU_CONTROLLER_H_ |