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

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: Removed StartTestStepFromClientThread() 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 620 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 private: 631 private:
632 const scoped_refptr<safe_browsing::SafeBrowsingUIManager> 632 const scoped_refptr<safe_browsing::SafeBrowsingUIManager>
633 safe_browsing_ui_manager_; 633 safe_browsing_ui_manager_;
634 }; 634 };
635 635
636 // A provider of Geolocation services to override AccessTokenStore. 636 // A provider of Geolocation services to override AccessTokenStore.
637 class ChromeGeolocationDelegate : public content::GeolocationDelegate { 637 class ChromeGeolocationDelegate : public content::GeolocationDelegate {
638 public: 638 public:
639 ChromeGeolocationDelegate() = default; 639 ChromeGeolocationDelegate() = default;
640 640
641 AccessTokenStore* CreateAccessTokenStore() final { 641 scoped_refptr<AccessTokenStore> CreateAccessTokenStore() final {
642 return new ChromeAccessTokenStore(); 642 return new ChromeAccessTokenStore();
643 } 643 }
644 644
645 private: 645 private:
646 DISALLOW_COPY_AND_ASSIGN(ChromeGeolocationDelegate); 646 DISALLOW_COPY_AND_ASSIGN(ChromeGeolocationDelegate);
647 }; 647 };
648 648
649 #if BUILDFLAG(ANDROID_JAVA_UI) 649 #if BUILDFLAG(ANDROID_JAVA_UI)
650 void HandleSingleTabModeBlockOnUIThread(const BlockedWindowParams& params) { 650 void HandleSingleTabModeBlockOnUIThread(const BlockedWindowParams& params) {
651 WebContents* web_contents = tab_util::GetWebContentsByFrameID( 651 WebContents* web_contents = tab_util::GetWebContentsByFrameID(
(...skipping 2395 matching lines...) Expand 10 before | Expand all | Expand 10 after
3047 if (channel <= kMaxDisableEncryptionChannel) { 3047 if (channel <= kMaxDisableEncryptionChannel) {
3048 static const char* const kWebRtcDevSwitchNames[] = { 3048 static const char* const kWebRtcDevSwitchNames[] = {
3049 switches::kDisableWebRtcEncryption, 3049 switches::kDisableWebRtcEncryption,
3050 }; 3050 };
3051 to_command_line->CopySwitchesFrom(from_command_line, 3051 to_command_line->CopySwitchesFrom(from_command_line,
3052 kWebRtcDevSwitchNames, 3052 kWebRtcDevSwitchNames,
3053 arraysize(kWebRtcDevSwitchNames)); 3053 arraysize(kWebRtcDevSwitchNames));
3054 } 3054 }
3055 } 3055 }
3056 #endif // defined(ENABLE_WEBRTC) 3056 #endif // defined(ENABLE_WEBRTC)
OLDNEW
« no previous file with comments | « android_webview/browser/aw_content_browser_client.cc ('k') | chrome/browser/geolocation/access_token_store_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698