Support touch icon in FaviconHelper

chrome/common/icon_messages.h

Index: chrome/common/icon_messages.h
diff --git a/chrome/common/icon_messages.h b/chrome/common/icon_messages.h
new file mode 100644
index 0000000000000000000000000000000000000000..ec97d2d78ebc6bfcf99b7f20623f354d3b1053bf
--- /dev/null
+++ b/chrome/common/icon_messages.h
@@ -0,0 +1,54 @@
+// 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.
+
+// Multiply-included message file, no traditional include guard.
+#include "googleurl/src/gurl.h"
+#include "ipc/ipc_message.h"
+#include "ipc/ipc_param_traits.h"
+
+#ifndef CHROME_COMMON_ICON_MESSAGES_H__
+#define CHROME_COMMON_ICON_MESSAGES_H__
+
+// The icon type in a page. The definition must be same as history::IconType.

[sky, 2011/03/22 19:48:48]

You should pull ViewHostMsg_UpdateFaviconURL into this file.

[michaelbai, 2011/03/22 23:59:03]

Probably not easy. Got error: redefinition of ‘class
ViewHostMsg_UpdateFaviconURL’

ViewHostMsg_UpdateFaviconURL needs to be defined out of '#ifdef #endif'guard,
though icon_messages.h is only included in favicon_helper.h which is only
included in tab_contents.h and prerender_content.h; but tab_contents.h is
included by a lot of files, it is not easy to find the loop.

I added a TODO

+enum IconType {
+  INVALID_ICON = 0x0,
+  FAVICON = 1 << 0,
+  TOUCH_ICON = 1 << 1,
+  TOUCH_PRECOMPOSED_ICON = 1 << 2

[sky, 2011/03/22 19:48:48]

Add a test that makes sure the values match.

[michaelbai, 2011/03/22 23:59:03]

Done.

+};
+
+// The favicon url from the render.
+struct FaviconURL {
+  FaviconURL();
+  FaviconURL(const GURL& url, IconType type);
+  ~FaviconURL();
+
+  // The url of the icon.
+  GURL icon_url;
+
+  // The type of the icon
+  IconType icon_type;
+};
+
+namespace IPC {
+
+template <>
+struct ParamTraits<IconType> {
+  typedef IconType param_type;
+  static void Write(Message* m, const param_type& p);
+  static bool Read(const Message* m, void** iter, param_type* p);
+  static void Log(const param_type& p, std::string* l);
+};
+
+template <>
+struct ParamTraits<FaviconURL> {
+  typedef FaviconURL param_type;
+  static void Write(Message* m, const param_type& p);
+  static bool Read(const Message* m, void** iter, param_type* p);
+  static void Log(const param_type& p, std::string* l);
+};
+
+}  // namespace IPC
+
+#endif  // CHROME_COMMON_ICON_MESSAGES_H__