Move functions out of TOUCH_UI defines.

chrome/browser/extensions/extension_function_dispatcher.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 
 #include <map>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/singleton.h"
@@ skipping 56 matching lines @@
 #include "chrome/common/url_constants.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 #if defined(TOOLKIT_VIEWS)
 #include "chrome/browser/extensions/extension_input_api.h"
 #endif
 
-#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
-#include "chrome/browser/extensions/extension_input_ui_api.h"
-#endif
-
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/extensions/extension_file_browser_private_api.h"
 #include "chrome/browser/extensions/extension_info_private_api_chromeos.h"
 #include "chrome/browser/extensions/extension_input_ime_api.h"
 #include "chrome/browser/extensions/extension_input_method_api.h"
+#include "chrome/browser/extensions/extension_input_ui_api.h"

[Peng, 2011/11/24 17:11:14]

I think it is safer if we only enable input_ui apis with virtual keyboard.

And if it is necessary, we could re-enable it later.

 #include "chrome/browser/extensions/extension_mediaplayer_private_api.h"
 #endif
 
 using extensions::ExtensionAPI;
 
 // FactoryRegistry -------------------------------------------------------------
 
 namespace {
 
 // Template for defining ExtensionFunctionFactory.
@@ skipping 225 matching lines @@
   RegisterFunction<SetCompositionFunction>();
   RegisterFunction<ClearCompositionFunction>();
   RegisterFunction<CommitTextFunction>();
   RegisterFunction<SetCandidateWindowPropertiesFunction>();
   RegisterFunction<SetCandidatesFunction>();
   RegisterFunction<SetCursorPositionFunction>();
   RegisterFunction<SetMenuItemsFunction>();
   RegisterFunction<UpdateMenuItemsFunction>();
 
   RegisterFunction<InputEventHandled>();
-#if defined(TOUCH_UI)
   RegisterFunction<CandidateClickedInputUiFunction>();

[Peng, 2011/11/24 17:11:14]

ditto

   RegisterFunction<CursorUpInputUiFunction>();
   RegisterFunction<CursorDownInputUiFunction>();
   RegisterFunction<PageUpInputUiFunction>();
   RegisterFunction<PageDownInputUiFunction>();
   RegisterFunction<RegisterInputUiFunction>();
   RegisterFunction<PageUpInputUiFunction>();
   RegisterFunction<PageDownInputUiFunction>();
 #endif
-#endif
 
   // Management.
   RegisterFunction<GetAllExtensionsFunction>();
   RegisterFunction<GetExtensionByIdFunction>();
   RegisterFunction<GetPermissionWarningsByIdFunction>();
   RegisterFunction<GetPermissionWarningsByManifestFunction>();
   RegisterFunction<LaunchAppFunction>();
   RegisterFunction<SetEnabledFunction>();
   RegisterFunction<UninstallFunction>();
 
@@ skipping 52 matching lines @@
   // Mediaplayer
   RegisterFunction<PlayAtMediaplayerFunction>();
   RegisterFunction<SetPlaybackErrorMediaplayerFunction>();
   RegisterFunction<GetPlaylistMediaplayerFunction>();
   RegisterFunction<TogglePlaylistPanelMediaplayerFunction>();
   RegisterFunction<ToggleFullscreenMediaplayerFunction>();
 
   // InputMethod
   RegisterFunction<GetInputMethodFunction>();
 
-#if defined(TOUCH_UI)
   // Input

[Peng, 2011/11/24 17:11:14]

ditto

   RegisterFunction<SendHandwritingStrokeFunction>();
   RegisterFunction<CancelHandwritingStrokesFunction>();
 #endif
-#endif
 
   // Websocket to TCP proxy. Currently noop on anything other than ChromeOS.
   RegisterFunction<WebSocketProxyPrivateGetPassportForTCPFunction>();
   RegisterFunction<WebSocketProxyPrivateGetURLForTCPFunction>();
 
   // Debugger
   RegisterFunction<AttachDebuggerFunction>();
   RegisterFunction<DetachDebuggerFunction>();
   RegisterFunction<SendCommandDebuggerFunction>();
 
@@ skipping 251 matching lines @@
   return function;
 }
 
 // static
 void ExtensionFunctionDispatcher::SendAccessDenied(
     IPC::Message::Sender* ipc_sender, int routing_id, int request_id) {
   ipc_sender->Send(new ExtensionMsg_Response(
       routing_id, request_id, false, std::string(),
       "Access to extension API denied."));
 }