Changes to content/ to facilitate new zoom extension API

content/common/view_messages.h

Index: content/common/view_messages.h
diff --git a/content/common/view_messages.h b/content/common/view_messages.h
index ac1d66588ab231bc5cf2b2fc91ab5c0f9dae6b6a..6040d514ec11031f78e93981fdf09fe89485d1d1 100644
--- a/content/common/view_messages.h
+++ b/content/common/view_messages.h
@@ -87,6 +87,7 @@ IPC_ENUM_TRAITS_MAX_VALUE(content::TapMultipleTargetsStrategy,
                           content::TAP_MULTIPLE_TARGETS_STRATEGY_MAX)
 IPC_ENUM_TRAITS(content::StopFindAction)
 IPC_ENUM_TRAITS(content::ThreeDAPIType)
+IPC_ENUM_TRAITS(content::ZoomMode)
 IPC_ENUM_TRAITS(media::ChannelLayout)
 IPC_ENUM_TRAITS(media::MediaLogEvent::Type)
 IPC_ENUM_TRAITS_MAX_VALUE(ui::TextInputMode, ui::TEXT_INPUT_MODE_MAX)
@@ -712,8 +713,10 @@ IPC_MESSAGE_ROUTED1(ViewMsg_Zoom,
 // Set the zoom level for the current main frame.  If the level actually
 // changes, a ViewHostMsg_DidZoomURL message will be sent back to the browser
 // telling it what url got zoomed and what its current zoom level is.
-IPC_MESSAGE_ROUTED1(ViewMsg_SetZoomLevel,
-                    double /* zoom_level */)
+IPC_MESSAGE_ROUTED3(ViewMsg_SetZoomLevel,
+                    int /* zoom_id */,
+                    double /* zoom_level */,
+                    content::ZoomMode /* zoom_mode */)
 
 // Set the zoom level for a particular url that the renderer is in the
 // process of loading.  This will be stored, to be used if the load commits
@@ -725,10 +728,11 @@ IPC_MESSAGE_ROUTED2(ViewMsg_SetZoomLevelForLoadingURL,
 // Set the zoom level for a particular url, so all render views
 // displaying this url can update their zoom levels to match.
 // If scheme is empty, then only host is used for matching.
-IPC_MESSAGE_CONTROL3(ViewMsg_SetZoomLevelForCurrentURL,
+IPC_MESSAGE_CONTROL4(ViewMsg_SetZoomLevelForCurrentURL,
                      std::string /* scheme */,
                      std::string /* host */,
-                     double /* zoom_level */)
+                     double /* zoom_level */,
+                     std::set<int> /* exceptions */)
 
 // Change encoding of page in the renderer.
 IPC_MESSAGE_ROUTED1(ViewMsg_SetPageEncoding,
@@ -1580,7 +1584,8 @@ IPC_SYNC_MESSAGE_ROUTED3_2(ViewHostMsg_RunBeforeUnloadConfirm,
 // browser can update its records.  If remember is true, then url is used to
 // update the zoom level for all pages in that site.  Otherwise, the render
 // view's id is used so that only the menu is updated.

[Fady Samuel, 2014/04/07 21:27:24]

Explain what zoom_id does here.

[paulmeyer, 2014/04/08 21:13:20]

Done.

-IPC_MESSAGE_ROUTED3(ViewHostMsg_DidZoomURL,
+IPC_MESSAGE_ROUTED4(ViewHostMsg_DidZoomURL,
+                    int /* zoom_id */,
                     double /* zoom_level */,
                     bool /* remember */,
                     GURL /* url */)