From 354e2cfc4fdcac9cecc2d7eac369968de24d128b Mon Sep 17 00:00:00 2001 From: "tc@google.com" Date: Thu, 14 May 2009 17:23:44 +0000 Subject: Revert "Implement OS X Encoding Menu." This reverts commit r16061. TBR=jeremy Review URL: http://codereview.chromium.org/115357 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16065 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/encoding_menu_controller.h | 53 ------------------------------- 1 file changed, 53 deletions(-) delete mode 100644 chrome/browser/encoding_menu_controller.h (limited to 'chrome/browser/encoding_menu_controller.h') diff --git a/chrome/browser/encoding_menu_controller.h b/chrome/browser/encoding_menu_controller.h deleted file mode 100644 index 9134b54..0000000 --- a/chrome/browser/encoding_menu_controller.h +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. -// 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_ - -#include - -#include "base/basictypes.h" // For DISALLOW_IMPLICIT_CONSTRUCTORS -#include "testing/gtest/include/gtest/gtest_prod.h" // For FRIEND_TEST - -class Browser; -class Profile; - -// Cross-platform logic needed for the encoding menu. -// For now, we don't need to track state so all methods are static. -class EncodingMenuController { - FRIEND_TEST(EncodingMenuControllerTest, EncodingIDsBelongTest); - FRIEND_TEST(EncodingMenuControllerTest, IsItemChecked); - - public: - typedef std::pair EncodingMenuItem; - typedef std::vector EncodingMenuItemList; - - public: - EncodingMenuController() {} - - // Given a command ID, does this command belong to the encoding menu? - bool DoesCommandBelongToEncodingMenu(int id); - - // Returns true if the given encoding menu item (specified by item_id) - // 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, - int item_id); - - // Fills in a list of menu items in the order they should appear in the menu. - // Items whose ids are 0 are separators. - void GetEncodingMenuItems(Profile* profile, - EncodingMenuItemList* menuItems); - - private: - // List of all valid encoding GUI IDs. - static const int kValidEncodingIds[]; - const int* ValidGUIEncodingIDs(); - int NumValidGUIEncodingIDs(); - private: - DISALLOW_COPY_AND_ASSIGN(EncodingMenuController); -}; - -#endif // CHORME_BROWSER_ENCODING_MENU_CONTROLLER_H_ -- cgit v1.1