diff options
Diffstat (limited to 'content')
-rw-r--r-- | content/common/accessibility_messages.h | 2 | ||||
-rw-r--r-- | content/common/browser_plugin/browser_plugin_messages.h | 4 | ||||
-rw-r--r-- | content/common/indexed_db/indexed_db_messages.h | 12 | ||||
-rw-r--r-- | content/common/input_messages.h | 2 | ||||
-rw-r--r-- | content/common/mojo/mojo_messages.h | 3 | ||||
-rw-r--r-- | content/common/screen_orientation_messages.h | 2 | ||||
-rw-r--r-- | content/common/service_worker/service_worker_messages.h | 2 | ||||
-rw-r--r-- | content/common/view_messages.h | 4 |
8 files changed, 18 insertions, 13 deletions
diff --git a/content/common/accessibility_messages.h b/content/common/accessibility_messages.h index 3a9ccb7..adb5284 100644 --- a/content/common/accessibility_messages.h +++ b/content/common/accessibility_messages.h @@ -108,7 +108,7 @@ IPC_MESSAGE_ROUTED3(AccessibilityMsg_SetTextSelection, // Determine the accessibility object under a given point and reply with // a AccessibilityHostMsg_HitTestResult with the same id. IPC_MESSAGE_ROUTED1(AccessibilityMsg_HitTest, - gfx::Point /* location to test */); + gfx::Point /* location to test */) // Tells the render view that a AccessibilityHostMsg_Events // message was processed and it can send addition events. diff --git a/content/common/browser_plugin/browser_plugin_messages.h b/content/common/browser_plugin/browser_plugin_messages.h index 8b92d36..fa84b4b 100644 --- a/content/common/browser_plugin/browser_plugin_messages.h +++ b/content/common/browser_plugin/browser_plugin_messages.h @@ -155,7 +155,7 @@ IPC_MESSAGE_ROUTED3(BrowserPluginHostMsg_HandleInputEvent, IPC_MESSAGE_ROUTED3(BrowserPluginHostMsg_CopyFromCompositingSurfaceAck, int /* instance_id */, int /* request_id */, - SkBitmap); + SkBitmap) // Notify the guest renderer that some resources given to the embededer // are not used any more. @@ -214,7 +214,7 @@ IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_ResizeGuest, // This message is sent in response to a completed attachment of a guest // to a BrowserPlugin. -IPC_MESSAGE_CONTROL1(BrowserPluginMsg_Attach_ACK, int /* instance_id */); +IPC_MESSAGE_CONTROL1(BrowserPluginMsg_Attach_ACK, int /* instance_id */) // Once the swapped out guest RenderView has been created in the embedder render // process, the browser process informs the embedder of its routing ID. diff --git a/content/common/indexed_db/indexed_db_messages.h b/content/common/indexed_db/indexed_db_messages.h index 729cdf2..93637a3 100644 --- a/content/common/indexed_db/indexed_db_messages.h +++ b/content/common/indexed_db/indexed_db_messages.h @@ -16,6 +16,15 @@ #include "ipc/ipc_param_traits.h" #include "third_party/WebKit/public/platform/WebIDBTypes.h" +// Singly-included section for typedefs in multiply-included file. +#ifndef CONTENT_COMMON_INDEXED_DB_INDEXED_DB_MESSAGES_H_ +#define CONTENT_COMMON_INDEXED_DB_INDEXED_DB_MESSAGES_H_ + +// An index id, and corresponding set of keys to insert. +typedef std::pair<int64, std::vector<content::IndexedDBKey> > IndexKeys; + +#endif // CONTENT_COMMON_INDEXED_DB_INDEXED_DB_MESSAGES_H_ + #undef IPC_MESSAGE_EXPORT #define IPC_MESSAGE_EXPORT CONTENT_EXPORT #define IPC_MESSAGE_START IndexedDBMsgStart @@ -31,9 +40,6 @@ IPC_ENUM_TRAITS_MAX_VALUE(blink::WebIDBTransactionMode, IPC_ENUM_TRAITS_MAX_VALUE(blink::WebIDBDataLoss, blink::WebIDBDataLossTotal) -// An index id, and corresponding set of keys to insert. -typedef std::pair<int64, std::vector<content::IndexedDBKey> > IndexKeys; - // Used to enumerate indexed databases. IPC_STRUCT_BEGIN(IndexedDBHostMsg_FactoryGetDatabaseNames_Params) // The response should have these ids. diff --git a/content/common/input_messages.h b/content/common/input_messages.h index f91ac6b..2ea722c 100644 --- a/content/common/input_messages.h +++ b/content/common/input_messages.h @@ -202,7 +202,7 @@ IPC_MESSAGE_ROUTED3(InputMsg_ActivateNearestFindResult, float /* y */) #endif -IPC_MESSAGE_ROUTED0(InputMsg_SyntheticGestureCompleted); +IPC_MESSAGE_ROUTED0(InputMsg_SyntheticGestureCompleted) // ----------------------------------------------------------------------------- // Messages sent from the renderer to the browser. diff --git a/content/common/mojo/mojo_messages.h b/content/common/mojo/mojo_messages.h index e9657da..45133d7 100644 --- a/content/common/mojo/mojo_messages.h +++ b/content/common/mojo/mojo_messages.h @@ -16,9 +16,8 @@ #undef IPC_MESSAGE_EXPORT #define IPC_MESSAGE_EXPORT CONTENT_EXPORT - #define IPC_MESSAGE_START MojoMsgStart // Mojo IPC is bootstrapped over Chrome IPC via this message. IPC_MESSAGE_CONTROL1(MojoMsg_Activate, - IPC::PlatformFileForTransit /* handle */); + IPC::PlatformFileForTransit /* handle */) diff --git a/content/common/screen_orientation_messages.h b/content/common/screen_orientation_messages.h index 334c765..5cfc6f4 100644 --- a/content/common/screen_orientation_messages.h +++ b/content/common/screen_orientation_messages.h @@ -48,7 +48,7 @@ IPC_MESSAGE_ROUTED3(ScreenOrientationMsg_LockSuccess, // process can associate the response to the right request. IPC_MESSAGE_ROUTED2(ScreenOrientationMsg_LockError, int, /* request_id */ - blink::WebLockOrientationError /* error */); + blink::WebLockOrientationError /* error */) // The renderer process requests the browser process to lock the screen // orientation to the specified |orientations|. The request contains a diff --git a/content/common/service_worker/service_worker_messages.h b/content/common/service_worker/service_worker_messages.h index fa65505..9715efc 100644 --- a/content/common/service_worker/service_worker_messages.h +++ b/content/common/service_worker/service_worker_messages.h @@ -104,7 +104,7 @@ IPC_MESSAGE_ROUTED2(ServiceWorkerHostMsg_InstallEventFinished, blink::WebServiceWorkerEventResult) IPC_MESSAGE_ROUTED2(ServiceWorkerHostMsg_ActivateEventFinished, int /* request_id */, - blink::WebServiceWorkerEventResult); + blink::WebServiceWorkerEventResult) IPC_MESSAGE_ROUTED3(ServiceWorkerHostMsg_FetchEventFinished, int /* request_id */, content::ServiceWorkerFetchEventResult, diff --git a/content/common/view_messages.h b/content/common/view_messages.h index 5160e05..144430a 100644 --- a/content/common/view_messages.h +++ b/content/common/view_messages.h @@ -885,7 +885,7 @@ IPC_MESSAGE_ROUTED3(ViewMsg_WindowSnapshotCompleted, std::vector<unsigned char> /* png */) #if defined(OS_MACOSX) -IPC_ENUM_TRAITS_MAX_VALUE(blink::ScrollerStyle, blink::ScrollerStyleOverlay); +IPC_ENUM_TRAITS_MAX_VALUE(blink::ScrollerStyle, blink::ScrollerStyleOverlay) // Notification of a change in scrollbar appearance and/or behavior. IPC_MESSAGE_CONTROL5(ViewMsg_UpdateScrollbarTheme, @@ -1106,7 +1106,7 @@ IPC_MESSAGE_ROUTED5(ViewHostMsg_Find_Reply, // Indicates that the render view has been closed in respose to a // Close message. IPC_MESSAGE_CONTROL1(ViewHostMsg_Close_ACK, - int /* old_route_id */); + int /* old_route_id */) // Indicates that the current page has been closed, after a ClosePage // message. |