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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome_frame/urlmon_url_request.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #include <htiframe.h> 5 #include <htiframe.h>
6 #include <mshtml.h> 6 #include <mshtml.h>
7 #include <shlobj.h> 7 #include <shlobj.h>
8 #include <wininet.h> 8 #include <wininet.h>
9 9
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 1157 matching lines...) Expand 10 before | Expand all | Expand 10 after
1168 "BINDSTATUS_64BIT_PROGRESS" 1168 "BINDSTATUS_64BIT_PROGRESS"
1169 }; 1169 };
1170 if (bind_status >= 1 && bind_status <= BINDSTATUS_64BIT_PROGRESS) 1170 if (bind_status >= 1 && bind_status <= BINDSTATUS_64BIT_PROGRESS)
1171 s = bindstatus_txt[bind_status - 1]; 1171 s = bindstatus_txt[bind_status - 1];
1172 else 1172 else
1173 s = StringPrintf("UnDoc[%#x]", bind_status); 1173 s = StringPrintf("UnDoc[%#x]", bind_status);
1174 return s; 1174 return s;
1175 } 1175 }
1176 1176
1177 std::string PiFlags2Str(DWORD flags) { 1177 std::string PiFlags2Str(DWORD flags) {
1178 #define ADD_PI_FLAG(x) if (flags & x) { s.append(#x ## " "); flags &= ~x; } 1178 #define ADD_PI_FLAG(x) \
1179 if (flags & x) { \
1180 s.append(#x ## " "); \
1181 flags &= ~x; \
1182 }
1183
1179 std::string s = " flags "; 1184 std::string s = " flags ";
1180 ADD_PI_FLAG(PI_PARSE_URL); 1185 ADD_PI_FLAG(PI_PARSE_URL);
1181 ADD_PI_FLAG(PI_FILTER_MODE); 1186 ADD_PI_FLAG(PI_FILTER_MODE);
1182 ADD_PI_FLAG(PI_FORCE_ASYNC); 1187 ADD_PI_FLAG(PI_FORCE_ASYNC);
1183 ADD_PI_FLAG(PI_USE_WORKERTHREAD); 1188 ADD_PI_FLAG(PI_USE_WORKERTHREAD);
1184 ADD_PI_FLAG(PI_MIMEVERIFICATION); 1189 ADD_PI_FLAG(PI_MIMEVERIFICATION);
1185 ADD_PI_FLAG(PI_CLSIDLOOKUP); 1190 ADD_PI_FLAG(PI_CLSIDLOOKUP);
1186 ADD_PI_FLAG(PI_DATAPROGRESS); 1191 ADD_PI_FLAG(PI_DATAPROGRESS);
1187 ADD_PI_FLAG(PI_SYNCHRONOUS); 1192 ADD_PI_FLAG(PI_SYNCHRONOUS);
1188 ADD_PI_FLAG(PI_APARTMENTTHREADED); 1193 ADD_PI_FLAG(PI_APARTMENTTHREADED);
1189 ADD_PI_FLAG(PI_CLASSINSTALL); 1194 ADD_PI_FLAG(PI_CLASSINSTALL);
1190 ADD_PI_FLAG(PI_PASSONBINDCTX); 1195 ADD_PI_FLAG(PI_PASSONBINDCTX);
1191 ADD_PI_FLAG(PI_NOMIMEHANDLER); 1196 ADD_PI_FLAG(PI_NOMIMEHANDLER);
1192 ADD_PI_FLAG(PI_LOADAPPDIRECT); 1197 ADD_PI_FLAG(PI_LOADAPPDIRECT);
1193 ADD_PI_FLAG(PD_FORCE_SWITCH); 1198 ADD_PI_FLAG(PD_FORCE_SWITCH);
1194 ADD_PI_FLAG(PI_PREFERDEFAULTHANDLER); 1199 ADD_PI_FLAG(PI_PREFERDEFAULTHANDLER);
1195 1200
1196 if (flags) 1201 if (flags)
1197 s += StringPrintf("+UnDoc[%#x]", flags); 1202 s += StringPrintf("+UnDoc[%#x]", flags);
1198 return s; 1203 return s;
1199 #undef ADD_PI_FLAG 1204 #undef ADD_PI_FLAG
1200 } 1205 }
1201 1206
1202 std::string Bscf2Str(DWORD flags) { 1207 std::string Bscf2Str(DWORD flags) {
1203 #define ADD_BSCF_FLAG(x) if (flags & x) { s.append(#x ## " "); flags &= ~x; } 1208 #define ADD_BSCF_FLAG(x) \
1209 if (flags & x) {\
1210 s.append(#x ## " "); \
1211 flags &= ~x; \
1212 }
1213
1204 std::string s = " flags "; 1214 std::string s = " flags ";
1205 ADD_BSCF_FLAG(BSCF_FIRSTDATANOTIFICATION) 1215 ADD_BSCF_FLAG(BSCF_FIRSTDATANOTIFICATION)
1206 ADD_BSCF_FLAG(BSCF_INTERMEDIATEDATANOTIFICATION) 1216 ADD_BSCF_FLAG(BSCF_INTERMEDIATEDATANOTIFICATION)
1207 ADD_BSCF_FLAG(BSCF_LASTDATANOTIFICATION) 1217 ADD_BSCF_FLAG(BSCF_LASTDATANOTIFICATION)
1208 ADD_BSCF_FLAG(BSCF_DATAFULLYAVAILABLE) 1218 ADD_BSCF_FLAG(BSCF_DATAFULLYAVAILABLE)
1209 ADD_BSCF_FLAG(BSCF_AVAILABLEDATASIZEUNKNOWN) 1219 ADD_BSCF_FLAG(BSCF_AVAILABLEDATASIZEUNKNOWN)
1210 ADD_BSCF_FLAG(BSCF_SKIPDRAINDATAFORFILEURLS) 1220 ADD_BSCF_FLAG(BSCF_SKIPDRAINDATAFORFILEURLS)
1211 ADD_BSCF_FLAG(BSCF_64BITLENGTHDOWNLOAD) 1221 ADD_BSCF_FLAG(BSCF_64BITLENGTHDOWNLOAD)
1212 1222
1213 if (flags) 1223 if (flags)
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
1246 1256
1247 bool ChromeFrameUrl::Parse(const std::wstring& url) { 1257 bool ChromeFrameUrl::Parse(const std::wstring& url) {
1248 bool ret = false; 1258 bool ret = false;
1249 if (url.empty()) 1259 if (url.empty())
1250 return ret; 1260 return ret;
1251 1261
1252 url_ = url; 1262 url_ = url;
1253 1263
1254 attach_to_external_tab_ = MatchPatternWide(url.c_str(), 1264 attach_to_external_tab_ = MatchPatternWide(url.c_str(),
1255 kChromeFrameAttachTabPattern); 1265 kChromeFrameAttachTabPattern);
1256 is_chrome_protocol_ = StartsWith(url, kChromeProtocolPrefix, 1266 is_chrome_protocol_ = StartsWith(url, kChromeProtocolPrefix, false);
1257 false);
1258 DCHECK(!(attach_to_external_tab_ && is_chrome_protocol_)); 1267 DCHECK(!(attach_to_external_tab_ && is_chrome_protocol_));
1259 if (is_chrome_protocol_) { 1268 if (is_chrome_protocol_) {
1260 url_.erase(0, lstrlen(kChromeProtocolPrefix)); 1269 url_.erase(0, lstrlen(kChromeProtocolPrefix));
1261 } 1270 }
1262 1271
1263 if (attach_to_external_tab_) { 1272 if (attach_to_external_tab_) {
1264 ret = ParseAttachExternalTabUrl(); 1273 ret = ParseAttachExternalTabUrl();
1265 } else { 1274 } else {
1266 ret = true; 1275 ret = true;
1267 } 1276 }
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
1364 DLOG(WARNING) << __FUNCTION__ 1373 DLOG(WARNING) << __FUNCTION__
1365 << " Disallowing navigation to gcf url: " 1374 << " Disallowing navigation to gcf url: "
1366 << cf_url.url(); 1375 << cf_url.url();
1367 return false; 1376 return false;
1368 } 1377 }
1369 } 1378 }
1370 1379
1371 return true; 1380 return true;
1372 } 1381 }
1373 1382
OLDNEW
« 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