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

Merge pull request #29 from brightray/chrome-29

Browse source 
Update to Chrome 29
This commit is contained in:
Adam Roben 2013-08-23 14:03:13 -07:00
commit 345bc3fc6b
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
brightray/browser/inspectable_web_contents_impl.cc
View file

@ -13,7 +13,7 @@
#include "base/prefs/pref_registry_simple.h"
#include "base/prefs/pref_service.h"
#include "base/stringprintf.h"
#include "base/utf_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "content/public/browser/devtools_agent_host.h"
#include "content/public/browser/devtools_client_host.h"
#include "content/public/browser/devtools_http_handler.h"

4
brightray/browser/url_request_context_getter.cc
View file

@ -30,8 +30,8 @@ namespace brightray {
URLRequestContextGetter::URLRequestContextGetter(
const base::FilePath& base_path,
MessageLoop* io_loop,
MessageLoop* file_loop,
base::MessageLoop* io_loop,
base::MessageLoop* file_loop,
scoped_ptr<NetworkDelegate> network_delegate,
content::ProtocolHandlerMap* protocol_handlers)
: base_path_(base_path),

2
brightray/common/application_info_win.cc
View file

@ -2,7 +2,7 @@
#include "base/file_version_info.h"
#include "base/memory/scoped_ptr.h"
#include "base/utf_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
namespace brightray {

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 5ffcb396d64df97a2d0220101e1e52598a661fc8
Subproject commit ccec3a4031fa79d61f4199d99e477813d2d72a5a