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

Unified Diff: chrome/test/automation/automation_messages.h

Issue 2126005: Revert 47357 - Revert 47347 (Original patch reviewed at http://codereview.ch... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/test/automation/automation_messages.h
===================================================================
--- chrome/test/automation/automation_messages.h (revision 47426)
+++ chrome/test/automation/automation_messages.h (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -452,7 +452,8 @@
std::wstring title;
GURL url;
SecurityStyle security_style;
- bool has_mixed_content;
+ bool displayed_mixed_content;
+ bool ran_mixed_content;
};
// Traits for NavigationInfo structure to pack/unpack.
@@ -466,7 +467,8 @@
WriteParam(m, p.title);
WriteParam(m, p.url);
WriteParam(m, p.security_style);
- WriteParam(m, p.has_mixed_content);
+ WriteParam(m, p.displayed_mixed_content);
+ WriteParam(m, p.ran_mixed_content);
}
static bool Read(const Message* m, void** iter, param_type* p) {
return ReadParam(m, iter, &p->navigation_type) &&
@@ -475,7 +477,8 @@
ReadParam(m, iter, &p->title) &&
ReadParam(m, iter, &p->url) &&
ReadParam(m, iter, &p->security_style) &&
- ReadParam(m, iter, &p->has_mixed_content);
+ ReadParam(m, iter, &p->displayed_mixed_content) &&
+ ReadParam(m, iter, &p->ran_mixed_content);
}
static void Log(const param_type& p, std::wstring* l) {
l->append(L"(");
@@ -491,7 +494,9 @@
l->append(L", ");
LogParam(p.security_style, l);
l->append(L", ");
- LogParam(p.has_mixed_content, l);
+ LogParam(p.displayed_mixed_content, l);
+ l->append(L", ");
+ LogParam(p.ran_mixed_content, l);
l->append(L")");
}
};

Powered by Google App Engine
This is Rietveld 408576698