From d3c6aa12d1ae5d718185ecb91c8732cdeb5e8643 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Wed, 11 Apr 2018 13:34:20 +0530 Subject: [PATCH] Remove AtomAccessTokenStore Its a dummy class since chromium 63, https://chromium-review.googlesource.com/c/chromium/src/+/708494 --- atom/browser/atom_access_token_store.h | 28 ------------------------- atom/browser/atom_browser_main_parts.cc | 23 +++----------------- filenames.gypi | 1 - 3 files changed, 3 insertions(+), 49 deletions(-) delete mode 100644 atom/browser/atom_access_token_store.h diff --git a/atom/browser/atom_access_token_store.h b/atom/browser/atom_access_token_store.h deleted file mode 100644 index 1107ad6a5b..0000000000 --- a/atom/browser/atom_access_token_store.h +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) 2014 GitHub, Inc. -// Use of this source code is governed by the MIT license that can be -// found in the LICENSE file. - -#ifndef ATOM_BROWSER_ATOM_ACCESS_TOKEN_STORE_H_ -#define ATOM_BROWSER_ATOM_ACCESS_TOKEN_STORE_H_ - -#include "device/geolocation/access_token_store.h" - -namespace atom { - -class AtomAccessTokenStore : public device::AccessTokenStore { - public: - AtomAccessTokenStore() = default; - - // device::AccessTokenStore: - void LoadAccessTokens(const LoadAccessTokensCallback& callback) override {} - void SaveAccessToken(const GURL& server_url, - const base::string16& access_token) override {} - - private: - ~AtomAccessTokenStore() override = default; - DISALLOW_COPY_AND_ASSIGN(AtomAccessTokenStore); -}; - -} // namespace atom - -#endif // ATOM_BROWSER_ATOM_ACCESS_TOKEN_STORE_H_ diff --git a/atom/browser/atom_browser_main_parts.cc b/atom/browser/atom_browser_main_parts.cc index 502d90abaa..b0a1c68c8d 100644 --- a/atom/browser/atom_browser_main_parts.cc +++ b/atom/browser/atom_browser_main_parts.cc @@ -6,7 +6,6 @@ #include "atom/browser/api/atom_api_app.h" #include "atom/browser/api/trackable_object.h" -#include "atom/browser/atom_access_token_store.h" #include "atom/browser/atom_browser_client.h" #include "atom/browser/atom_browser_context.h" #include "atom/browser/bridge_task_runner.h" @@ -21,7 +20,6 @@ #include "chrome/browser/browser_process.h" #include "content/public/browser/child_process_security_policy.h" #include "content/public/common/result_codes.h" -#include "device/geolocation/geolocation_delegate.h" #include "device/geolocation/geolocation_provider.h" #include "ui/base/idle/idle.h" #include "ui/base/l10n/l10n_util.h" @@ -49,22 +47,6 @@ namespace atom { namespace { -// A provider of Geolocation services to override AccessTokenStore. -class AtomGeolocationDelegate : public device::GeolocationDelegate { - public: - AtomGeolocationDelegate() { - device::GeolocationProvider::GetInstance() - ->UserDidOptIntoLocationServices(); - } - - scoped_refptr CreateAccessTokenStore() final { - return new AtomAccessTokenStore(); - } - - private: - DISALLOW_COPY_AND_ASSIGN(AtomGeolocationDelegate); -}; - template void Erase(T* container, typename T::iterator iter) { container->erase(iter); @@ -246,8 +228,9 @@ void AtomBrowserMainParts::PostMainMessageLoopStart() { #if defined(OS_POSIX) HandleShutdownSignals(); #endif - device::GeolocationProvider::SetGeolocationDelegate( - new AtomGeolocationDelegate()); + // TODO(deepak1556): Enable this optionally based on response + // from AtomPermissionManager. + device::GeolocationProvider::GetInstance()->UserDidOptIntoLocationServices(); } void AtomBrowserMainParts::PostMainMessageLoopRun() { diff --git a/filenames.gypi b/filenames.gypi index 78f99c1428..76527f382a 100644 --- a/filenames.gypi +++ b/filenames.gypi @@ -192,7 +192,6 @@ 'atom/browser/auto_updater.cc', 'atom/browser/auto_updater.h', 'atom/browser/auto_updater_mac.mm', - 'atom/browser/atom_access_token_store.h', 'atom/browser/atom_blob_reader.cc', 'atom/browser/atom_blob_reader.h', 'atom/browser/atom_browser_client.cc',