Update to Chromium revision 233896.

- The CefBrowserSettings.author_and_user_styles option is now always enabled.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1512 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-11-08 21:28:56 +00:00
parent d789d84c30
commit 133e06c50a
52 changed files with 452 additions and 414 deletions

View File

@@ -168,25 +168,25 @@ void CefResponseImpl::SetResponseHeaders(
mime_type_ = mime_type;
}
void CefResponseImpl::Set(const WebKit::WebURLResponse& response) {
void CefResponseImpl::Set(const blink::WebURLResponse& response) {
DCHECK(!response.isNull());
AutoLock lock_scope(this);
CHECK_READONLY_RETURN_VOID();
WebKit::WebString str;
blink::WebString str;
status_code_ = response.httpStatusCode();
str = response.httpStatusText();
status_text_ = CefString(str);
str = response.mimeType();
mime_type_ = CefString(str);
class HeaderVisitor : public WebKit::WebHTTPHeaderVisitor {
class HeaderVisitor : public blink::WebHTTPHeaderVisitor {
public:
explicit HeaderVisitor(HeaderMap* map) : map_(map) {}
virtual void visitHeader(const WebKit::WebString& name,
const WebKit::WebString& value) {
virtual void visitHeader(const blink::WebString& name,
const blink::WebString& value) {
map_->insert(std::make_pair(string16(name), string16(value)));
}