Update to latest libchromiumcontent
* vendor/libchromiumcontent b6a0d85...0d607ee (3): > Stop trying to compile SQLitePersistentCookieStore separately > Update to latest Chromium trunk revision > Merge pull request #4 from aroben/atom
This commit is contained in:
parent
0b5ab8e43d
commit
80cb76355c
10 changed files with 40 additions and 19 deletions
|
@ -10,7 +10,19 @@
|
|||
|
||||
namespace brightray {
|
||||
|
||||
namespace {
|
||||
|
||||
BrowserClient* g_browser_client;
|
||||
|
||||
}
|
||||
|
||||
BrowserClient* BrowserClient::Get() {
|
||||
return g_browser_client;
|
||||
}
|
||||
|
||||
BrowserClient::BrowserClient() {
|
||||
DCHECK(!g_browser_client);
|
||||
g_browser_client = this;
|
||||
}
|
||||
|
||||
BrowserClient::~BrowserClient() {
|
||||
|
|
|
@ -15,6 +15,8 @@ class NotificationPresenter;
|
|||
|
||||
class BrowserClient : public content::ContentBrowserClient {
|
||||
public:
|
||||
static BrowserClient* Get();
|
||||
|
||||
BrowserClient();
|
||||
~BrowserClient();
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#include "browser/devtools_delegate.h"
|
||||
|
||||
#include "content/public/browser/devtools_http_handler.h"
|
||||
#include "net/base/tcp_listen_socket.h"
|
||||
#include "net/socket/tcp_listen_socket.h"
|
||||
|
||||
namespace brightray {
|
||||
|
||||
|
|
|
@ -40,4 +40,10 @@ std::string DevToolsDelegate::GetViewDescription(content::RenderViewHost*) {
|
|||
return std::string();
|
||||
}
|
||||
|
||||
scoped_refptr<net::StreamListenSocket> DevToolsDelegate::CreateSocketForTethering(
|
||||
net::StreamListenSocket::Delegate*,
|
||||
std::string* name) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -22,6 +22,9 @@ private:
|
|||
virtual content::RenderViewHost* CreateNewTarget() OVERRIDE;
|
||||
virtual TargetType GetTargetType(content::RenderViewHost*) OVERRIDE;
|
||||
virtual std::string GetViewDescription(content::RenderViewHost*) OVERRIDE;
|
||||
virtual scoped_refptr<net::StreamListenSocket> CreateSocketForTethering(
|
||||
net::StreamListenSocket::Delegate*,
|
||||
std::string* name) OVERRIDE;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -64,8 +64,7 @@ void InspectableWebContentsImpl::ShowDevTools() {
|
|||
agent_host_ = content::DevToolsAgentHost::GetOrCreateFor(web_contents_->GetRenderViewHost());
|
||||
frontend_host_.reset(content::DevToolsClientHost::CreateDevToolsFrontendHost(devtools_web_contents_.get(), this));
|
||||
|
||||
auto client = static_cast<BrowserClient*>(content::GetContentClient()->browser());
|
||||
auto handler = client->browser_main_parts()->devtools_http_handler();
|
||||
auto handler = BrowserClient::Get()->browser_main_parts()->devtools_http_handler();
|
||||
auto url = handler->GetFrontendURL(nullptr);
|
||||
devtools_web_contents_->GetController().LoadURL(url, content::Referrer(), content::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string());
|
||||
}
|
||||
|
|
|
@ -7,10 +7,10 @@
|
|||
#include "network_delegate.h"
|
||||
#include "base/string_util.h"
|
||||
#include "base/threading/worker_pool.h"
|
||||
#include "chrome/browser/net/sqlite_persistent_cookie_store.h"
|
||||
#include "content/public/browser/browser_thread.h"
|
||||
#include "content/public/browser/cookie_store_factory.h"
|
||||
#include "content/public/common/url_constants.h"
|
||||
#include "net/base/cert_verifier.h"
|
||||
#include "net/cert/cert_verifier.h"
|
||||
#include "net/cookies/cookie_monster.h"
|
||||
#include "net/http/http_auth_handler_factory.h"
|
||||
#include "net/http/http_cache.h"
|
||||
|
@ -59,14 +59,11 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext()
|
|||
url_request_context_->set_network_delegate(network_delegate_.get());
|
||||
storage_.reset(
|
||||
new net::URLRequestContextStorage(url_request_context_.get()));
|
||||
storage_->set_cookie_store(new net::CookieMonster(
|
||||
new SQLitePersistentCookieStore(
|
||||
base_path_.Append(FILE_PATH_LITERAL("Cookies")),
|
||||
content::BrowserThread::GetMessageLoopProxyForThread(content::BrowserThread::IO),
|
||||
content::BrowserThread::GetMessageLoopProxyForThread(content::BrowserThread::DB),
|
||||
false,
|
||||
nullptr),
|
||||
NULL));
|
||||
storage_->set_cookie_store(content::CreatePersistentCookieStore(
|
||||
base_path_.Append(FILE_PATH_LITERAL("Cookies")),
|
||||
false,
|
||||
nullptr,
|
||||
nullptr));
|
||||
storage_->set_server_bound_cert_service(new net::ServerBoundCertService(
|
||||
new net::DefaultServerBoundCertStore(NULL),
|
||||
base::WorkerPool::GetTaskRunner(true)));
|
||||
|
|
|
@ -10,7 +10,9 @@
|
|||
#include "content/public/browser/content_browser_client.h"
|
||||
#include "net/url_request/url_request_context_getter.h"
|
||||
|
||||
namespace base {
|
||||
class MessageLoop;
|
||||
}
|
||||
|
||||
namespace net {
|
||||
class HostResolver;
|
||||
|
@ -25,8 +27,8 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
|
|||
public:
|
||||
URLRequestContextGetter(
|
||||
const base::FilePath& base_path,
|
||||
MessageLoop* io_loop,
|
||||
MessageLoop* file_loop,
|
||||
base::MessageLoop* io_loop,
|
||||
base::MessageLoop* file_loop,
|
||||
content::ProtocolHandlerMap*);
|
||||
virtual ~URLRequestContextGetter();
|
||||
|
||||
|
@ -37,8 +39,8 @@ private:
|
|||
virtual scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner() const OVERRIDE;
|
||||
|
||||
base::FilePath base_path_;
|
||||
MessageLoop* io_loop_;
|
||||
MessageLoop* file_loop_;
|
||||
base::MessageLoop* io_loop_;
|
||||
base::MessageLoop* file_loop_;
|
||||
|
||||
scoped_ptr<net::ProxyConfigService> proxy_config_service_;
|
||||
scoped_ptr<net::NetworkDelegate> network_delegate_;
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
#import "common/mac/foundation_util.h"
|
||||
#import "common/mac/main_application_bundle.h"
|
||||
|
||||
#import "base/sys_string_conversions.h"
|
||||
#import "base/strings/sys_string_conversions.h"
|
||||
|
||||
namespace brightray {
|
||||
|
||||
|
|
2
brightray/vendor/libchromiumcontent
vendored
2
brightray/vendor/libchromiumcontent
vendored
|
@ -1 +1 @@
|
|||
Subproject commit b6a0d851db2e4f1bf181e05d3e9c2d8fe6ef7f0c
|
||||
Subproject commit 0d607ee56be77990ba3a929aa4016c1633bad208
|
Loading…
Add table
Add a link
Reference in a new issue