re-apply r34183...

chrome/common/render_messages.h

 // Copyright (c) 2009 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.
 
 #ifndef CHROME_COMMON_RENDER_MESSAGES_H_
 #define CHROME_COMMON_RENDER_MESSAGES_H_
 
 #include <string>
 #include <vector>
 #include <map>
@@ skipping 1541 matching lines @@
 // Traits for RendererPreferences structure to pack/unpack.
 template <>
 struct ParamTraits<RendererPreferences> {
   typedef RendererPreferences param_type;
   static void Write(Message* m, const param_type& p) {
     WriteParam(m, p.can_accept_load_drops);
     WriteParam(m, p.should_antialias_text);
     WriteParam(m, static_cast<int>(p.hinting));
     WriteParam(m, static_cast<int>(p.subpixel_rendering));
     WriteParam(m, p.focus_ring_color);
+    WriteParam(m, p.thumb_active_color);
+    WriteParam(m, p.thumb_inactive_color);
+    WriteParam(m, p.track_color);
     WriteParam(m, p.browser_handles_top_level_requests);
   }
   static bool Read(const Message* m, void** iter, param_type* p) {
     if (!ReadParam(m, iter, &p->can_accept_load_drops))
       return false;
     if (!ReadParam(m, iter, &p->should_antialias_text))
       return false;
 
     int hinting = 0;
     if (!ReadParam(m, iter, &hinting))
       return false;
     p->hinting = static_cast<RendererPreferencesHintingEnum>(hinting);
 
     int subpixel_rendering = 0;
     if (!ReadParam(m, iter, &subpixel_rendering))
       return false;
     p->subpixel_rendering =
         static_cast<RendererPreferencesSubpixelRenderingEnum>(
             subpixel_rendering);
 
     int focus_ring_color;
     if (!ReadParam(m, iter, &focus_ring_color))
       return false;
     p->focus_ring_color = focus_ring_color;
 
+    int thumb_active_color, thumb_inactive_color, track_color;
+    if (!ReadParam(m, iter, &thumb_active_color) ||
+        !ReadParam(m, iter, &thumb_inactive_color) ||
+        !ReadParam(m, iter, &track_color))
+      return false;
+    p->thumb_active_color = thumb_active_color;
+    p->thumb_inactive_color = thumb_inactive_color;
+    p->track_color = track_color;
+
     if (!ReadParam(m, iter, &p->browser_handles_top_level_requests))
       return false;
 
     return true;
   }
   static void Log(const param_type& p, std::wstring* l) {
     l->append(L"<RendererPreferences>");
   }
 };
 
@@ skipping 707 matching lines @@
   }
 };
 
 }  // namespace IPC
 
 
 #define MESSAGES_INTERNAL_FILE "chrome/common/render_messages_internal.h"
 #include "ipc/ipc_message_macros.h"
 
 #endif  // CHROME_COMMON_RENDER_MESSAGES_H_