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

Fix compilation error on Linux.

Browse source
This commit is contained in:
Cheng Zhao 2014-08-13 14:43:21 +08:00
parent adb8fb59bd
commit 8a7efcdcd2
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
atom/browser/atom_access_token_store.cc
View file

@ -4,6 +4,8 @@
#include "atom/browser/atom_access_token_store.h" #include "atom/browser/atom_access_token_store.h"
#include <utility>
#include "atom/browser/atom_browser_context.h" #include "atom/browser/atom_browser_context.h"
#include "atom/browser/net/atom_url_request_context_getter.h" #include "atom/browser/net/atom_url_request_context_getter.h"
@ -33,7 +35,14 @@ AtomAccessTokenStore::~AtomAccessTokenStore() {
void AtomAccessTokenStore::LoadAccessTokens( void AtomAccessTokenStore::LoadAccessTokens(
const LoadAccessTokensCallbackType& callback) { const LoadAccessTokensCallbackType& callback) {
AccessTokenSet access_token_set; AccessTokenSet access_token_set;
access_token_set[GURL(kGeolocationProviderUrl)];
// Equivelent to access_token_set[kGeolocationProviderUrl].
// Somehow base::string16 is causing compilation errors when used in a pair
// of std::map on Linux, this can work around it.
std::pair<GURL, base::string16> token_pair;
token_pair.first = GURL(kGeolocationProviderUrl);
access_token_set.insert(token_pair);
callback.Run(access_token_set, callback.Run(access_token_set,
AtomBrowserContext::Get()->url_request_context_getter()); AtomBrowserContext::Get()->url_request_context_getter());
} }