Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(139)

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2129313002: Geolocation cleanup: corrects uses of content::AccessTokenStore* and net::URLRequestContextGetter* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: wez@ comments. Rebase Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after
630 private: 630 private:
631 const scoped_refptr<safe_browsing::SafeBrowsingUIManager> 631 const scoped_refptr<safe_browsing::SafeBrowsingUIManager>
632 safe_browsing_ui_manager_; 632 safe_browsing_ui_manager_;
633 }; 633 };
634 634
635 // A provider of Geolocation services to override AccessTokenStore. 635 // A provider of Geolocation services to override AccessTokenStore.
636 class ChromeGeolocationDelegate : public content::GeolocationDelegate { 636 class ChromeGeolocationDelegate : public content::GeolocationDelegate {
637 public: 637 public:
638 ChromeGeolocationDelegate() = default; 638 ChromeGeolocationDelegate() = default;
639 639
640 AccessTokenStore* CreateAccessTokenStore() final { 640 scoped_refptr<AccessTokenStore> CreateAccessTokenStore() final {
641 return new ChromeAccessTokenStore(); 641 return new ChromeAccessTokenStore();
642 } 642 }
643 643
644 private: 644 private:
645 DISALLOW_COPY_AND_ASSIGN(ChromeGeolocationDelegate); 645 DISALLOW_COPY_AND_ASSIGN(ChromeGeolocationDelegate);
646 }; 646 };
647 647
648 #if BUILDFLAG(ANDROID_JAVA_UI) 648 #if BUILDFLAG(ANDROID_JAVA_UI)
649 void HandleSingleTabModeBlockOnUIThread(const BlockedWindowParams& params) { 649 void HandleSingleTabModeBlockOnUIThread(const BlockedWindowParams& params) {
650 WebContents* web_contents = tab_util::GetWebContentsByFrameID( 650 WebContents* web_contents = tab_util::GetWebContentsByFrameID(
(...skipping 2395 matching lines...) Expand 10 before | Expand all | Expand 10 after
3046 if (channel <= kMaxDisableEncryptionChannel) { 3046 if (channel <= kMaxDisableEncryptionChannel) {
3047 static const char* const kWebRtcDevSwitchNames[] = { 3047 static const char* const kWebRtcDevSwitchNames[] = {
3048 switches::kDisableWebRtcEncryption, 3048 switches::kDisableWebRtcEncryption,
3049 }; 3049 };
3050 to_command_line->CopySwitchesFrom(from_command_line, 3050 to_command_line->CopySwitchesFrom(from_command_line,
3051 kWebRtcDevSwitchNames, 3051 kWebRtcDevSwitchNames,
3052 arraysize(kWebRtcDevSwitchNames)); 3052 arraysize(kWebRtcDevSwitchNames));
3053 } 3053 }
3054 } 3054 }
3055 #endif // defined(ENABLE_WEBRTC) 3055 #endif // defined(ENABLE_WEBRTC)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698