Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(314)

Side by Side Diff: chrome/browser/importer/importer_messages.h

Issue 6650026: Fixed a bug in the serialization of history::URLRow. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | ipc/ipc_message_macros.h » ('j') | ipc/ipc_message_macros.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_IMPORTER_IMPORTER_MESSAGES_H_ 5 #ifndef CHROME_BROWSER_IMPORTER_IMPORTER_MESSAGES_H_
6 #define CHROME_BROWSER_IMPORTER_IMPORTER_MESSAGES_H_ 6 #define CHROME_BROWSER_IMPORTER_IMPORTER_MESSAGES_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 WriteParam(m, p.last_visit()); 79 WriteParam(m, p.last_visit());
80 WriteParam(m, p.hidden()); 80 WriteParam(m, p.hidden());
81 } 81 }
82 static bool Read(const Message* m, void** iter, param_type* p) { 82 static bool Read(const Message* m, void** iter, param_type* p) {
83 history::URLID id; 83 history::URLID id;
84 GURL url; 84 GURL url;
85 string16 title; 85 string16 title;
86 int visit_count, typed_count; 86 int visit_count, typed_count;
87 base::Time last_visit; 87 base::Time last_visit;
88 bool hidden; 88 bool hidden;
89 history::FavIconID favicon_id;
90 if (!ReadParam(m, iter, &id) || 89 if (!ReadParam(m, iter, &id) ||
91 !ReadParam(m, iter, &url) || 90 !ReadParam(m, iter, &url) ||
92 !ReadParam(m, iter, &title) || 91 !ReadParam(m, iter, &title) ||
93 !ReadParam(m, iter, &visit_count) || 92 !ReadParam(m, iter, &visit_count) ||
94 !ReadParam(m, iter, &typed_count) || 93 !ReadParam(m, iter, &typed_count) ||
95 !ReadParam(m, iter, &last_visit) || 94 !ReadParam(m, iter, &last_visit) ||
96 !ReadParam(m, iter, &hidden) || 95 !ReadParam(m, iter, &hidden))
97 !ReadParam(m, iter, &favicon_id))
Joao da Silva 2011/03/09 15:45:50 The problem is that this param is Read, but is nev
98 return false; 96 return false;
99 *p = history::URLRow(url, id); 97 *p = history::URLRow(url, id);
100 p->set_title(title); 98 p->set_title(title);
101 p->set_visit_count(visit_count); 99 p->set_visit_count(visit_count);
102 p->set_typed_count(typed_count); 100 p->set_typed_count(typed_count);
103 p->set_last_visit(last_visit); 101 p->set_last_visit(last_visit);
104 p->set_hidden(hidden); 102 p->set_hidden(hidden);
105 return true; 103 return true;
106 } 104 }
107 static void Log(const param_type& p, std::string* l) { 105 static void Log(const param_type& p, std::string* l) {
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 static void Log(const param_type& p, std::string* l) { 358 static void Log(const param_type& p, std::string* l) {
361 l->append("<TemplateURL>"); 359 l->append("<TemplateURL>");
362 } 360 }
363 }; 361 };
364 362
365 } // namespace IPC 363 } // namespace IPC
366 364
367 #include "chrome/browser/importer/importer_messages_internal.h" 365 #include "chrome/browser/importer/importer_messages_internal.h"
368 366
369 #endif // CHROME_BROWSER_IMPORTER_IMPORTER_MESSAGES_H_ 367 #endif // CHROME_BROWSER_IMPORTER_IMPORTER_MESSAGES_H_
OLDNEW
« no previous file with comments | « no previous file | ipc/ipc_message_macros.h » ('j') | ipc/ipc_message_macros.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698