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

WIP: chrome 54 update

Browse source
This commit is contained in:
Jacob Groundwater 2016-11-09 07:50:03 +00:00 • committed by Birunthan Mohanathas
parent 5b3d0f86f7
commit 9716e2745b
4 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
atom/browser/atom_access_token_store.cc
View file

@ -11,7 +11,7 @@
#include "atom/common/google_api_key.h" #include "atom/common/google_api_key.h"
#include "base/environment.h" #include "base/environment.h"
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
#include "content/public/browser/geolocation_provider.h" #include "device/geolocation/geolocation_provider.h"
using content::BrowserThread; using content::BrowserThread;
@ -24,7 +24,7 @@ namespace internal {
class TokenLoadingJob : public base::RefCountedThreadSafe<TokenLoadingJob> { class TokenLoadingJob : public base::RefCountedThreadSafe<TokenLoadingJob> {
public: public:
explicit TokenLoadingJob( explicit TokenLoadingJob(
const content::AccessTokenStore::LoadAccessTokensCallback& callback) const device::AccessTokenStore::LoadAccessTokensCallback& callback)
: callback_(callback), request_context_getter_(nullptr) {} : callback_(callback), request_context_getter_(nullptr) {}
void Run(AtomBrowserContext* browser_context) { void Run(AtomBrowserContext* browser_context) {
@ -47,7 +47,7 @@ class TokenLoadingJob : public base::RefCountedThreadSafe<TokenLoadingJob> {
// Equivalent to access_token_map[kGeolocationProviderURL]. // Equivalent to access_token_map[kGeolocationProviderURL].
// Somehow base::string16 is causing compilation errors when used in a pair // Somehow base::string16 is causing compilation errors when used in a pair
// of std::map on Linux, this can work around it. // of std::map on Linux, this can work around it.
content::AccessTokenStore::AccessTokenMap access_token_map; device::AccessTokenStore::AccessTokenMap access_token_map;
std::pair<GURL, base::string16> token_pair; std::pair<GURL, base::string16> token_pair;
token_pair.first = GURL(GOOGLEAPIS_ENDPOINT + api_key_); token_pair.first = GURL(GOOGLEAPIS_ENDPOINT + api_key_);
access_token_map.insert(token_pair); access_token_map.insert(token_pair);
@ -55,7 +55,7 @@ class TokenLoadingJob : public base::RefCountedThreadSafe<TokenLoadingJob> {
callback_.Run(access_token_map, request_context_getter_); callback_.Run(access_token_map, request_context_getter_);
} }
content::AccessTokenStore::LoadAccessTokensCallback callback_; device::AccessTokenStore::LoadAccessTokensCallback callback_;
net::URLRequestContextGetter* request_context_getter_; net::URLRequestContextGetter* request_context_getter_;
std::string api_key_; std::string api_key_;
}; };
@ -64,7 +64,7 @@ class TokenLoadingJob : public base::RefCountedThreadSafe<TokenLoadingJob> {
AtomAccessTokenStore::AtomAccessTokenStore() { AtomAccessTokenStore::AtomAccessTokenStore() {
browser_context_ = AtomBrowserContext::From("", false); browser_context_ = AtomBrowserContext::From("", false);
content::GeolocationProvider::GetInstance()->UserDidOptIntoLocationServices(); device::GeolocationProvider::GetInstance()->UserDidOptIntoLocationServices();
} }
AtomAccessTokenStore::~AtomAccessTokenStore() { AtomAccessTokenStore::~AtomAccessTokenStore() {

6
atom/browser/atom_access_token_store.h
View file

@ -5,7 +5,7 @@
#ifndef ATOM_BROWSER_ATOM_ACCESS_TOKEN_STORE_H_ #ifndef ATOM_BROWSER_ATOM_ACCESS_TOKEN_STORE_H_
#define ATOM_BROWSER_ATOM_ACCESS_TOKEN_STORE_H_ #define ATOM_BROWSER_ATOM_ACCESS_TOKEN_STORE_H_
#include "content/public/browser/access_token_store.h" #include "device/geolocation/access_token_store.h"
namespace atom { namespace atom {
@ -15,12 +15,12 @@ namespace internal {
class TokenLoadingJob; class TokenLoadingJob;
} }
class AtomAccessTokenStore : public content::AccessTokenStore { class AtomAccessTokenStore : public device::AccessTokenStore {
public: public:
AtomAccessTokenStore(); AtomAccessTokenStore();
~AtomAccessTokenStore(); ~AtomAccessTokenStore();
// content::AccessTokenStore: // device::AccessTokenStore:
void LoadAccessTokens( void LoadAccessTokens(
const LoadAccessTokensCallback& callback) override; const LoadAccessTokensCallback& callback) override;
void SaveAccessToken(const GURL& server_url, void SaveAccessToken(const GURL& server_url,

2
atom/browser/atom_security_state_model_client.cc
View file

@ -81,7 +81,7 @@ void AtomSecurityStateModelClient::GetVisibleSecurityState(
return; return;
} }
state->initialized = true; state->connection_info_initialized = true;
state->url = entry->GetURL(); state->url = entry->GetURL();
const content::SSLStatus& ssl = entry->GetSSL(); const content::SSLStatus& ssl = entry->GetSSL();
state->initial_security_level = state->initial_security_level =

10
electron.gyp
View file

@ -147,15 +147,15 @@
'destination': '<(PRODUCT_DIR)', 'destination': '<(PRODUCT_DIR)',
'files': [ 'files': [
'<@(copied_libraries)', '<@(copied_libraries)',
'<(libchromiumcontent_dir)/locales', # '<(libchromiumcontent_dir)/locales',
'<(libchromiumcontent_dir)/libEGL.dll', '<(libchromiumcontent_dir)/libEGL.dll',
'<(libchromiumcontent_dir)/libGLESv2.dll', '<(libchromiumcontent_dir)/libGLESv2.dll',
'<(libchromiumcontent_dir)/icudtl.dat', '<(libchromiumcontent_dir)/icudtl.dat',
'<(libchromiumcontent_dir)/blink_image_resources_200_percent.pak', # '<(libchromiumcontent_dir)/blink_image_resources_200_percent.pak',
'<(libchromiumcontent_dir)/content_resources_200_percent.pak', # '<(libchromiumcontent_dir)/content_resources_200_percent.pak',
'<(libchromiumcontent_dir)/content_shell.pak', '<(libchromiumcontent_dir)/content_shell.pak',
'<(libchromiumcontent_dir)/ui_resources_200_percent.pak', # '<(libchromiumcontent_dir)/ui_resources_200_percent.pak',
'<(libchromiumcontent_dir)/views_resources_200_percent.pak', # '<(libchromiumcontent_dir)/views_resources_200_percent.pak',
'<(libchromiumcontent_dir)/natives_blob.bin', '<(libchromiumcontent_dir)/natives_blob.bin',
'<(libchromiumcontent_dir)/snapshot_blob.bin', '<(libchromiumcontent_dir)/snapshot_blob.bin',
'external_binaries/d3dcompiler_47.dll', 'external_binaries/d3dcompiler_47.dll',