Merge Android RetrieveWebappInformation and Extensions GetApplicationInfo.

chrome/common/render_messages.h

Index: chrome/common/render_messages.h
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index 83ba550ef5317b6e3242a0367df172bce00e46e0..ff52bc38014dfb4313ccfd721a7ef514a590b7d9 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -21,6 +21,7 @@
 #include "chrome/common/ntp_logging_events.h"
 #include "chrome/common/omnibox_focus_state.h"
 #include "chrome/common/search_provider.h"
+#include "chrome/common/web_application_info.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
 #include "components/content_settings/core/common/content_settings_types.h"
@@ -187,6 +188,24 @@ IPC_STRUCT_TRAITS_END()
 IPC_ENUM_TRAITS_MAX_VALUE(NTPLoggingEventType,
                           NTP_NUM_EVENT_TYPES)
 
+IPC_ENUM_TRAITS_MAX_VALUE(WebApplicationInfo::MobileCapable,
+                          WebApplicationInfo::MOBILE_CAPABLE_APPLE)
+
+IPC_STRUCT_TRAITS_BEGIN(WebApplicationInfo::IconInfo)
+  IPC_STRUCT_TRAITS_MEMBER(url)
+  IPC_STRUCT_TRAITS_MEMBER(width)
+  IPC_STRUCT_TRAITS_MEMBER(height)
+  IPC_STRUCT_TRAITS_MEMBER(data)
+IPC_STRUCT_TRAITS_END()
+
+IPC_STRUCT_TRAITS_BEGIN(WebApplicationInfo)
+  IPC_STRUCT_TRAITS_MEMBER(title)
+  IPC_STRUCT_TRAITS_MEMBER(description)
+  IPC_STRUCT_TRAITS_MEMBER(app_url)
+  IPC_STRUCT_TRAITS_MEMBER(icons)
+  IPC_STRUCT_TRAITS_MEMBER(mobile_capable)
+IPC_STRUCT_TRAITS_END()
+
 //-----------------------------------------------------------------------------
 // RenderView messages
 // These are messages sent from the browser to the renderer process.
@@ -308,12 +327,11 @@ IPC_MESSAGE_ROUTED2(ChromeViewHostMsg_RequestThumbnailForContextNode_ACK,
                     SkBitmap /* thumbnail */,
                     gfx::Size /* original size of the image */)
 
-#if defined(OS_ANDROID)
-// Asks the renderer to return information about whether the current page can
-// be treated as a webapp.
-IPC_MESSAGE_ROUTED1(ChromeViewMsg_RetrieveWebappInformation,
-                    GURL /* expected_url */)
+// Requests application info for the page. The renderer responds back with
+// ChromeViewHostMsg_DidGetWebApplicationInfo.
+IPC_MESSAGE_ROUTED0(ChromeViewMsg_GetWebApplicationInfo)
 
+#if defined(OS_ANDROID)
 // Asks the renderer to return information about the given meta tag.
 IPC_MESSAGE_ROUTED2(ChromeViewMsg_RetrieveMetaTagContent,
                     GURL /* expected_url */,
@@ -547,14 +565,10 @@ IPC_MESSAGE_ROUTED0(ChromeViewHostMsg_DidBlockDisplayingInsecureContent)
 // a secure origin by a security policy.  The page may appear incomplete.
 IPC_MESSAGE_ROUTED0(ChromeViewHostMsg_DidBlockRunningInsecureContent)
 
-#if defined(OS_ANDROID)
-// Contains info about whether the current page can be treated as a webapp.
-IPC_MESSAGE_ROUTED4(ChromeViewHostMsg_DidRetrieveWebappInformation,
-                    bool /* success */,
-                    bool /* is_mobile_webapp_capable */,
-                    bool /* is_apple_mobile_webapp_capable */,
-                    GURL /* expected_url */)
+IPC_MESSAGE_ROUTED1(ChromeViewHostMsg_DidGetWebApplicationInfo,
+                    WebApplicationInfo)
 
+#if defined(OS_ANDROID)
 IPC_MESSAGE_ROUTED4(ChromeViewHostMsg_DidRetrieveMetaTagContent,
                     bool /* success */,
                     std::string /* tag_name */,