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

Unified Diff: chrome_frame/utils.cc

Issue 3061036: Handle automation server crashes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 4 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
« no previous file with comments | « chrome_frame/urlmon_url_request.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/utils.cc
===================================================================
--- chrome_frame/utils.cc (revision 55540)
+++ chrome_frame/utils.cc (working copy)
@@ -1175,7 +1175,12 @@
}
std::string PiFlags2Str(DWORD flags) {
-#define ADD_PI_FLAG(x) if (flags & x) { s.append(#x ## " "); flags &= ~x; }
+#define ADD_PI_FLAG(x) \
+ if (flags & x) { \
+ s.append(#x ## " "); \
+ flags &= ~x; \
+ }
+
std::string s = " flags ";
ADD_PI_FLAG(PI_PARSE_URL);
ADD_PI_FLAG(PI_FILTER_MODE);
@@ -1200,7 +1205,12 @@
}
std::string Bscf2Str(DWORD flags) {
-#define ADD_BSCF_FLAG(x) if (flags & x) { s.append(#x ## " "); flags &= ~x; }
+#define ADD_BSCF_FLAG(x) \
+ if (flags & x) {\
+ s.append(#x ## " "); \
+ flags &= ~x; \
+ }
+
std::string s = " flags ";
ADD_BSCF_FLAG(BSCF_FIRSTDATANOTIFICATION)
ADD_BSCF_FLAG(BSCF_INTERMEDIATEDATANOTIFICATION)
@@ -1253,8 +1263,7 @@
attach_to_external_tab_ = MatchPatternWide(url.c_str(),
kChromeFrameAttachTabPattern);
- is_chrome_protocol_ = StartsWith(url, kChromeProtocolPrefix,
- false);
+ is_chrome_protocol_ = StartsWith(url, kChromeProtocolPrefix, false);
DCHECK(!(attach_to_external_tab_ && is_chrome_protocol_));
if (is_chrome_protocol_) {
url_.erase(0, lstrlen(kChromeProtocolPrefix));
« no previous file with comments | « chrome_frame/urlmon_url_request.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698