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

Update to latest libchromiumcontent

Browse source
This commit is contained in:
Adam Roben 2013-03-21 15:09:00 -04:00
parent 909b3cd18f
commit 3cda49b894
6 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
brightray/browser/browser_context.cc
View file

@ -11,7 +11,6 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/resource_context.h"
#include "content/public/browser/storage_partition.h"
#include "net/base/host_resolver.h"
#include "url_request_context_getter.h"
namespace brightray {
@ -34,7 +33,6 @@ private:
}
URLRequestContextGetter* getter_;
scoped_ptr<net::HostResolver> host_resolver_;
};
BrowserContext::BrowserContext() : resource_context_(new ResourceContext) {

4
brightray/browser/devtools_delegate.cc
View file

@ -36,4 +36,8 @@ content::DevToolsHttpHandlerDelegate::TargetType DevToolsDelegate::GetTargetType
return kTargetTypeTab;
}
std::string DevToolsDelegate::GetViewDescription(content::RenderViewHost*) {
return std::string();
}
}

1
brightray/browser/devtools_delegate.h
View file

@ -21,6 +21,7 @@ private:
virtual std::string GetPageThumbnailData(const GURL&) OVERRIDE;
virtual content::RenderViewHost* CreateNewTarget() OVERRIDE;
virtual TargetType GetTargetType(content::RenderViewHost*) OVERRIDE;
virtual std::string GetViewDescription(content::RenderViewHost*) OVERRIDE;
};
}

2
brightray/browser/devtools_frontend.cc
View file

@ -25,7 +25,7 @@ content::WebContents* DevToolsFrontend::Show(content::WebContents* inspected_con
DevToolsFrontend::DevToolsFrontend(content::WebContents* inspected_contents)
: WebContentsObserver(content::WebContents::Create(content::WebContents::CreateParams(inspected_contents->GetBrowserContext()))),
inspected_web_contents_(inspected_contents),
agent_host_(content::DevToolsAgentHost::GetFor(inspected_contents->GetRenderViewHost())),
agent_host_(content::DevToolsAgentHost::GetOrCreateFor(inspected_contents->GetRenderViewHost())),
frontend_host_(content::DevToolsClientHost::CreateDevToolsFrontendHost(web_contents(), this)) {
web_contents()->SetDelegate(this);
auto client = static_cast<BrowserClient*>(content::GetContentClient()->browser());

8
brightray/browser/url_request_context_getter.cc
View file

@ -10,14 +10,14 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/common/url_constants.h"
#include "net/base/cert_verifier.h"
#include "net/base/default_server_bound_cert_store.h"
#include "net/base/server_bound_cert_service.h"
#include "net/base/ssl_config_service_defaults.h"
#include "net/cookies/cookie_monster.h"
#include "net/http/http_auth_handler_factory.h"
#include "net/http/http_cache.h"
#include "net/http/http_server_properties_impl.h"
#include "net/proxy/proxy_service.h"
#include "net/ssl/default_server_bound_cert_store.h"
#include "net/ssl/server_bound_cert_service.h"
#include "net/ssl/ssl_config_service_defaults.h"
#include "net/url_request/static_http_user_agent_settings.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_storage.h"
@ -64,7 +64,7 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext()
base::WorkerPool::GetTaskRunner(true)));
storage_->set_http_user_agent_settings(
new net::StaticHttpUserAgentSettings(
"en-us,en", "iso-8859-1,*,utf-8", EmptyString()));
"en-us,en", EmptyString()));
scoped_ptr<net::HostResolver> host_resolver(
net::HostResolver::CreateDefaultResolver(NULL));

2
brightray/vendor/libchromiumcontent vendored

@ -1 +1 @@
Subproject commit 3f6f01c46be61f36b4e25456bf2c0539ef4d77f3
Subproject commit 8a81d74a56712c112cad1956fdd8ed836532a378