mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update to Chromium r202921

Browse source 
* vendor/libchromiumcontent 0d02a8d...2f53a96 (1):
  > Merge pull request #14 from brightray/latest-chromium
This commit is contained in:
Adam Roben 2013-05-30 15:04:51 -04:00
parent f88634fea5
commit 2582e8561c
4 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
brightray/brightray.gypi
View file

@ -207,6 +207,7 @@
4245, # 'initializing' : conversion from 'int' to 'const net::QuicVersionTag', signed/unsigned mismatch
4251, # class 'std::xx' needs to have dll-interface.
4310, # cast truncates constant value
4355, # 'this' : used in base member initializer list
4480, # nonstandard extension used: specifying underlying type for enum
4481, # nonstandard extension used: override specifier 'override'
4512, # assignment operator could not be generated

1
brightray/browser/url_request_context_getter.cc
View file

@ -90,6 +90,7 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext()
net::HttpCache::DefaultBackend* main_backend =
new net::HttpCache::DefaultBackend(
net::DISK_CACHE,
net::CACHE_BACKEND_DEFAULT,
cache_path,
0,
content::BrowserThread::GetMessageLoopProxyForThread(

2
brightray/common/content_client.cc
View file

@ -9,7 +9,7 @@
#include "base/stringprintf.h"
#include "base/string_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "webkit/user_agent/user_agent_util.h"
#include "webkit/common/user_agent/user_agent_util.h"
namespace brightray {

2
brightray/vendor/libchromiumcontent vendored

@ -1 +1 @@
Subproject commit 0d02a8d41a1d6711f196a744126fa5e2eba961ff
Subproject commit 2f53a96fc665176d7e07b67bac6d861295587ce8