bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge revision 944 changes: 

- Linux: Fix compile errors.

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1271@945 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2012-12-06 20:56:53 +00:00
parent 30b8290002
commit e8f9068070
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cef3/cef.gypi
View File

@ -18,5 +18,11 @@
'clang_use_chrome_plugins': 0, 'clang_use_chrome_plugins': 0,
}], }],
] ]
}, }, 'conditions': [
['os_posix==1 and OS!="mac" and OS!="android"', {
'target_defaults': {
'cflags_cc': ['-Wno-deprecated-declarations'],
},
}],
]
} }

2
cef3/libcef/browser/url_request_context_getter.h
View File

@ -28,6 +28,7 @@ class URLRequestJobFactory;
class URLSecurityManager; class URLSecurityManager;
} }
/*
// Classes used in network request processing: // Classes used in network request processing:
// //
// RC = net::URLRequestContext // RC = net::URLRequestContext
@ -66,6 +67,7 @@ class URLSecurityManager;
// CefBrowserHostImpl -ref-> RCGP----/ / // CefBrowserHostImpl -ref-> RCGP----/ /
// ^ / // ^ /
// \-ref--------------------------/ // \-ref--------------------------/
*/
class CefURLRequestContextGetter : public net::URLRequestContextGetter { class CefURLRequestContextGetter : public net::URLRequestContextGetter {
public: public: