| Index: chrome/browser/extensions/extension_function_registry.cc | 
| =================================================================== | 
| --- chrome/browser/extensions/extension_function_registry.cc	(revision 176049) | 
| +++ chrome/browser/extensions/extension_function_registry.cc	(working copy) | 
| @@ -7,44 +7,23 @@ | 
| #include "chrome/browser/accessibility/accessibility_extension_api.h" | 
| #include "chrome/browser/extensions/api/app/app_api.h" | 
| #include "chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h" | 
| -#include "chrome/browser/extensions/api/bookmarks/bookmark_api.h" | 
| #include "chrome/browser/extensions/api/browsing_data/browsing_data_api.h" | 
| -#include "chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.h" | 
| #include "chrome/browser/extensions/api/commands/commands.h" | 
| -#include "chrome/browser/extensions/api/content_settings/content_settings_api.h" | 
| -#include "chrome/browser/extensions/api/context_menu/context_menu_api.h" | 
| -#include "chrome/browser/extensions/api/cookies/cookies_api.h" | 
| -#include "chrome/browser/extensions/api/debugger/debugger_api.h" | 
| -#include "chrome/browser/extensions/api/declarative/declarative_api.h" | 
| #include "chrome/browser/extensions/api/extension_action/extension_browser_actions_api.h" | 
| #include "chrome/browser/extensions/api/extension_action/extension_page_actions_api.h" | 
| #include "chrome/browser/extensions/api/extension_action/extension_script_badge_api.h" | 
| -#include "chrome/browser/extensions/api/font_settings/font_settings_api.h" | 
| -#include "chrome/browser/extensions/api/history/history_api.h" | 
| -#include "chrome/browser/extensions/api/identity/identity_api.h" | 
| -#include "chrome/browser/extensions/api/i18n/i18n_api.h" | 
| #include "chrome/browser/extensions/api/idle/idle_api.h" | 
| #include "chrome/browser/extensions/api/managed_mode/managed_mode_api.h" | 
| -#include "chrome/browser/extensions/api/management/management_api.h" | 
| #include "chrome/browser/extensions/api/metrics/metrics.h" | 
| #include "chrome/browser/extensions/api/module/module.h" | 
| #include "chrome/browser/extensions/api/omnibox/omnibox_api.h" | 
| -#include "chrome/browser/extensions/api/page_capture/page_capture_api.h" | 
| -#include "chrome/browser/extensions/api/permissions/permissions_api.h" | 
| #include "chrome/browser/extensions/api/preference/preference_api.h" | 
| -#include "chrome/browser/extensions/api/record/record_api.h" | 
| #include "chrome/browser/extensions/api/runtime/runtime_api.h" | 
| -#include "chrome/browser/extensions/api/serial/serial_api.h" | 
| -#include "chrome/browser/extensions/api/socket/socket_api.h" | 
| -#include "chrome/browser/extensions/api/tabs/execute_code_in_tab_function.h" | 
| -#include "chrome/browser/extensions/api/tabs/tabs.h" | 
| #include "chrome/browser/extensions/api/test/test_api.h" | 
| #include "chrome/browser/extensions/api/top_sites/top_sites_api.h" | 
| -#include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h" | 
| #include "chrome/browser/extensions/api/web_request/web_request_api.h" | 
| #include "chrome/browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.h" | 
| #include "chrome/browser/extensions/api/webstore_private/webstore_private_api.h" | 
| -#include "chrome/browser/extensions/settings/settings_api.h" | 
| #include "chrome/browser/extensions/system/system_api.h" | 
| #include "chrome/browser/infobars/infobar_extension_api.h" | 
| #include "chrome/browser/rlz/rlz_extension_api.h" | 
| @@ -53,18 +32,17 @@ | 
|  | 
| #if defined(TOOLKIT_VIEWS) | 
| #include "chrome/browser/extensions/api/input/input.h" | 
| -#endif | 
| +#endif  // defined(TOOLKIT_VIEWS) | 
|  | 
| #if defined(OS_CHROMEOS) | 
| #include "chrome/browser/chromeos/extensions/echo_private_api.h" | 
| -#include "chrome/browser/chromeos/extensions/file_browser_handler_api.h" | 
| #include "chrome/browser/chromeos/extensions/info_private_api.h" | 
| #include "chrome/browser/chromeos/extensions/input_method_api.h" | 
| #include "chrome/browser/chromeos/extensions/media_player_api.h" | 
| #include "chrome/browser/chromeos/extensions/power/power_api.h" | 
| #include "chrome/browser/chromeos/extensions/wallpaper_private_api.h" | 
| #include "chrome/browser/extensions/api/terminal/terminal_private_api.h" | 
| -#endif | 
| +#endif  // defined(OS_CHROMEOS) | 
|  | 
| // static | 
| ExtensionFunctionRegistry* ExtensionFunctionRegistry::GetInstance() { | 
| @@ -83,33 +61,6 @@ | 
|  | 
| // Register all functions here. | 
|  | 
| -  // Windows | 
| -  RegisterFunction<GetWindowFunction>(); | 
| -  RegisterFunction<GetCurrentWindowFunction>(); | 
| -  RegisterFunction<GetLastFocusedWindowFunction>(); | 
| -  RegisterFunction<GetAllWindowsFunction>(); | 
| -  RegisterFunction<CreateWindowFunction>(); | 
| -  RegisterFunction<UpdateWindowFunction>(); | 
| -  RegisterFunction<RemoveWindowFunction>(); | 
| - | 
| -  // Tabs | 
| -  RegisterFunction<CaptureVisibleTabFunction>(); | 
| -  RegisterFunction<CreateTabFunction>(); | 
| -  RegisterFunction<DetectTabLanguageFunction>(); | 
| -  RegisterFunction<DuplicateTabFunction>(); | 
| -  RegisterFunction<GetAllTabsInWindowFunction>(); | 
| -  RegisterFunction<GetCurrentTabFunction>(); | 
| -  RegisterFunction<GetSelectedTabFunction>(); | 
| -  RegisterFunction<GetTabFunction>(); | 
| -  RegisterFunction<HighlightTabsFunction>(); | 
| -  RegisterFunction<MoveTabsFunction>(); | 
| -  RegisterFunction<QueryTabsFunction>(); | 
| -  RegisterFunction<ReloadTabFunction>(); | 
| -  RegisterFunction<RemoveTabsFunction>(); | 
| -  RegisterFunction<TabsExecuteScriptFunction>(); | 
| -  RegisterFunction<TabsInsertCSSFunction>(); | 
| -  RegisterFunction<UpdateTabFunction>(); | 
| - | 
| // Page Actions. | 
| RegisterFunction<EnablePageActionsFunction>(); | 
| RegisterFunction<DisablePageActionsFunction>(); | 
| @@ -154,21 +105,6 @@ | 
| RegisterFunction<RemovePasswordsFunction>(); | 
| RegisterFunction<RemoveWebSQLFunction>(); | 
|  | 
| -  // Bookmarks. | 
| -  RegisterFunction<extensions::GetBookmarksFunction>(); | 
| -  RegisterFunction<extensions::GetBookmarkChildrenFunction>(); | 
| -  RegisterFunction<extensions::GetBookmarkRecentFunction>(); | 
| -  RegisterFunction<extensions::GetBookmarkTreeFunction>(); | 
| -  RegisterFunction<extensions::GetBookmarkSubTreeFunction>(); | 
| -  RegisterFunction<extensions::ImportBookmarksFunction>(); | 
| -  RegisterFunction<extensions::ExportBookmarksFunction>(); | 
| -  RegisterFunction<extensions::SearchBookmarksFunction>(); | 
| -  RegisterFunction<extensions::RemoveBookmarkFunction>(); | 
| -  RegisterFunction<extensions::RemoveTreeBookmarkFunction>(); | 
| -  RegisterFunction<extensions::CreateBookmarkFunction>(); | 
| -  RegisterFunction<extensions::MoveBookmarkFunction>(); | 
| -  RegisterFunction<extensions::UpdateBookmarkFunction>(); | 
| - | 
| // Infobars. | 
| RegisterFunction<ShowInfoBarFunction>(); | 
|  | 
| @@ -185,22 +121,10 @@ | 
| RegisterFunction<extensions::CanEditBookmarkManagerFunction>(); | 
| RegisterFunction<extensions::CanOpenNewWindowsBookmarkFunction>(); | 
|  | 
| -  // History | 
| -  RegisterFunction<extensions::AddUrlHistoryFunction>(); | 
| -  RegisterFunction<extensions::DeleteAllHistoryFunction>(); | 
| -  RegisterFunction<extensions::DeleteRangeHistoryFunction>(); | 
| -  RegisterFunction<extensions::DeleteUrlHistoryFunction>(); | 
| -  RegisterFunction<extensions::GetMostVisitedHistoryFunction>(); | 
| -  RegisterFunction<extensions::GetVisitsHistoryFunction>(); | 
| -  RegisterFunction<extensions::SearchHistoryFunction>(); | 
| - | 
| // Idle | 
| RegisterFunction<extensions::IdleQueryStateFunction>(); | 
| RegisterFunction<extensions::IdleSetDetectionIntervalFunction>(); | 
|  | 
| -  // I18N. | 
| -  RegisterFunction<GetAcceptLanguagesFunction>(); | 
| - | 
| // Metrics. | 
| RegisterFunction<extensions::MetricsRecordUserActionFunction>(); | 
| RegisterFunction<extensions::MetricsRecordValueFunction>(); | 
| @@ -220,13 +144,6 @@ | 
| RegisterFunction<RlzClearProductStateFunction>(); | 
| #endif | 
|  | 
| -  // Cookies. | 
| -  RegisterFunction<extensions::GetCookieFunction>(); | 
| -  RegisterFunction<extensions::GetAllCookiesFunction>(); | 
| -  RegisterFunction<extensions::SetCookieFunction>(); | 
| -  RegisterFunction<extensions::RemoveCookieFunction>(); | 
| -  RegisterFunction<extensions::GetAllCookieStoresFunction>(); | 
| - | 
| // Test. | 
| RegisterFunction<extensions::TestNotifyPassFunction>(); | 
| RegisterFunction<extensions::TestFailFunction>(); | 
| @@ -236,10 +153,6 @@ | 
| RegisterFunction<extensions::TestSendMessageFunction>(); | 
| RegisterFunction<extensions::TestGetConfigFunction>(); | 
|  | 
| -  // Record. | 
| -  RegisterFunction<extensions::CaptureURLsFunction>(); | 
| -  RegisterFunction<extensions::ReplayURLsFunction>(); | 
| - | 
| // Accessibility. | 
| RegisterFunction<GetFocusedControlFunction>(); | 
| RegisterFunction<SetAccessibilityEnabledFunction>(); | 
| @@ -248,12 +161,6 @@ | 
| // Commands. | 
| RegisterFunction<GetAllCommandsFunction>(); | 
|  | 
| -  // Context Menus. | 
| -  RegisterFunction<extensions::CreateContextMenuFunction>(); | 
| -  RegisterFunction<extensions::UpdateContextMenuFunction>(); | 
| -  RegisterFunction<extensions::RemoveContextMenuFunction>(); | 
| -  RegisterFunction<extensions::RemoveAllContextMenusFunction>(); | 
| - | 
| // Omnibox. | 
| RegisterFunction<extensions::OmniboxSendSuggestionsFunction>(); | 
| RegisterFunction<extensions::OmniboxSetDefaultSuggestionFunction>(); | 
| @@ -282,15 +189,6 @@ | 
| RegisterFunction<extensions::GetPolicyFunction>(); | 
| RegisterFunction<extensions::SetPolicyFunction>(); | 
|  | 
| -  // Management. | 
| -  RegisterFunction<extensions::GetAllExtensionsFunction>(); | 
| -  RegisterFunction<extensions::GetExtensionByIdFunction>(); | 
| -  RegisterFunction<extensions::GetPermissionWarningsByIdFunction>(); | 
| -  RegisterFunction<extensions::GetPermissionWarningsByManifestFunction>(); | 
| -  RegisterFunction<extensions::LaunchAppFunction>(); | 
| -  RegisterFunction<extensions::SetEnabledFunction>(); | 
| -  RegisterFunction<extensions::UninstallFunction>(); | 
| - | 
| // Extension module. | 
| RegisterFunction<extensions::SetUpdateUrlDataFunction>(); | 
| RegisterFunction<extensions::IsAllowedIncognitoAccessFunction>(); | 
| @@ -305,14 +203,9 @@ | 
| RegisterFunction<extensions::CompleteInstallFunction>(); | 
| RegisterFunction<extensions::GetWebGLStatusFunction>(); | 
|  | 
| -  // WebNavigation. | 
| -  RegisterFunction<extensions::GetFrameFunction>(); | 
| -  RegisterFunction<extensions::GetAllFramesFunction>(); | 
| - | 
| // WebRequest. | 
| RegisterFunction<WebRequestAddEventListener>(); | 
| RegisterFunction<WebRequestEventHandled>(); | 
| -  RegisterFunction<WebRequestHandlerBehaviorChanged>(); | 
|  | 
| // Preferences. | 
| RegisterFunction<extensions::GetPreferenceFunction>(); | 
| @@ -324,9 +217,6 @@ | 
| // Device Customization. | 
| RegisterFunction<extensions::GetChromeosInfoFunction>(); | 
|  | 
| -  // FileBrowserHandlerInternal. | 
| -  RegisterFunction<FileHandlerSelectFileFunction>(); | 
| - | 
| // Mediaplayer | 
| RegisterFunction<extensions::PlayMediaplayerFunction>(); | 
| RegisterFunction<extensions::GetPlaylistMediaplayerFunction>(); | 
| @@ -362,83 +252,17 @@ | 
| extensions::WebSocketProxyPrivateGetPassportForTCPFunction>(); | 
| RegisterFunction<extensions::WebSocketProxyPrivateGetURLForTCPFunction>(); | 
|  | 
| -  // Debugger | 
| -  RegisterFunction<AttachDebuggerFunction>(); | 
| -  RegisterFunction<DetachDebuggerFunction>(); | 
| -  RegisterFunction<SendCommandDebuggerFunction>(); | 
| - | 
| -  // Settings | 
| -  RegisterFunction<extensions::GetSettingsFunction>(); | 
| -  RegisterFunction<extensions::SetSettingsFunction>(); | 
| -  RegisterFunction<extensions::RemoveSettingsFunction>(); | 
| -  RegisterFunction<extensions::ClearSettingsFunction>(); | 
| -  RegisterFunction<extensions::GetBytesInUseSettingsFunction>(); | 
| - | 
| -  // Content settings. | 
| -  RegisterFunction<extensions::GetResourceIdentifiersFunction>(); | 
| -  RegisterFunction<extensions::ClearContentSettingsFunction>(); | 
| -  RegisterFunction<extensions::GetContentSettingFunction>(); | 
| -  RegisterFunction<extensions::SetContentSettingFunction>(); | 
| - | 
| -  // Font settings. | 
| -  RegisterFunction<extensions::GetFontListFunction>(); | 
| -  RegisterFunction<extensions::ClearFontFunction>(); | 
| -  RegisterFunction<extensions::GetFontFunction>(); | 
| -  RegisterFunction<extensions::SetFontFunction>(); | 
| -  RegisterFunction<extensions::ClearDefaultFontSizeFunction>(); | 
| -  RegisterFunction<extensions::GetDefaultFontSizeFunction>(); | 
| -  RegisterFunction<extensions::SetDefaultFontSizeFunction>(); | 
| -  RegisterFunction<extensions::ClearDefaultFixedFontSizeFunction>(); | 
| -  RegisterFunction<extensions::GetDefaultFixedFontSizeFunction>(); | 
| -  RegisterFunction<extensions::SetDefaultFixedFontSizeFunction>(); | 
| -  RegisterFunction<extensions::ClearMinimumFontSizeFunction>(); | 
| -  RegisterFunction<extensions::GetMinimumFontSizeFunction>(); | 
| -  RegisterFunction<extensions::SetMinimumFontSizeFunction>(); | 
| - | 
| -  // CloudPrint settings. | 
| -  RegisterFunction<extensions::CloudPrintSetupConnectorFunction>(); | 
| -  RegisterFunction<extensions::CloudPrintGetHostNameFunction>(); | 
| -  RegisterFunction<extensions::CloudPrintGetPrintersFunction>(); | 
| - | 
| // Experimental App API. | 
| RegisterFunction<extensions::AppNotifyFunction>(); | 
| RegisterFunction<extensions::AppClearAllNotificationsFunction>(); | 
|  | 
| -  // Permissions | 
| -  RegisterFunction<ContainsPermissionsFunction>(); | 
| -  RegisterFunction<GetAllPermissionsFunction>(); | 
| -  RegisterFunction<RemovePermissionsFunction>(); | 
| -  RegisterFunction<RequestPermissionsFunction>(); | 
| - | 
| -  // PageCapture | 
| -  RegisterFunction<extensions::PageCaptureSaveAsMHTMLFunction>(); | 
| - | 
| // TopSites | 
| RegisterFunction<extensions::GetTopSitesFunction>(); | 
|  | 
| -  // Serial | 
| -  RegisterFunction<extensions::SerialOpenFunction>(); | 
| -  RegisterFunction<extensions::SerialCloseFunction>(); | 
| -  RegisterFunction<extensions::SerialReadFunction>(); | 
| -  RegisterFunction<extensions::SerialWriteFunction>(); | 
| - | 
| -  // Sockets | 
| -  RegisterFunction<extensions::SocketCreateFunction>(); | 
| -  RegisterFunction<extensions::SocketDestroyFunction>(); | 
| -  RegisterFunction<extensions::SocketConnectFunction>(); | 
| -  RegisterFunction<extensions::SocketDisconnectFunction>(); | 
| -  RegisterFunction<extensions::SocketReadFunction>(); | 
| -  RegisterFunction<extensions::SocketWriteFunction>(); | 
| - | 
| // System | 
| RegisterFunction<extensions::GetIncognitoModeAvailabilityFunction>(); | 
| RegisterFunction<extensions::GetUpdateStatusFunction>(); | 
|  | 
| -  // Net | 
| -  RegisterFunction<extensions::AddRulesFunction>(); | 
| -  RegisterFunction<extensions::RemoveRulesFunction>(); | 
| -  RegisterFunction<extensions::GetRulesFunction>(); | 
| - | 
| // Runtime | 
| RegisterFunction<extensions::RuntimeGetBackgroundPageFunction>(); | 
| RegisterFunction<extensions::RuntimeReloadFunction>(); | 
|  |