| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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/geolocation/geolocation_permission_context_android.h" | 5 #include "chrome/browser/geolocation/geolocation_permission_context_android.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 495 content::RenderFrameHost::FromID(id.render_process_id(), | 495 content::RenderFrameHost::FromID(id.render_process_id(), |
| 496 id.render_frame_id())); | 496 id.render_frame_id())); |
| 497 if (!web_contents) | 497 if (!web_contents) |
| 498 return; | 498 return; |
| 499 | 499 |
| 500 SearchGeolocationDisclosureTabHelper* disclosure_helper = | 500 SearchGeolocationDisclosureTabHelper* disclosure_helper = |
| 501 SearchGeolocationDisclosureTabHelper::FromWebContents(web_contents); | 501 SearchGeolocationDisclosureTabHelper::FromWebContents(web_contents); |
| 502 | 502 |
| 503 // The tab helper can be null in tests. | 503 // The tab helper can be null in tests. |
| 504 if (disclosure_helper) | 504 if (disclosure_helper) |
| 505 disclosure_helper->MaybeShowDisclosure(requesting_origin); | 505 disclosure_helper->MaybeShowDisclosureForAPIAccess(requesting_origin); |
| 506 } | 506 } |
| 507 } | 507 } |
| 508 | 508 |
| 509 void GeolocationPermissionContextAndroid::SetLocationSettingsForTesting( | 509 void GeolocationPermissionContextAndroid::SetLocationSettingsForTesting( |
| 510 std::unique_ptr<LocationSettings> settings) { | 510 std::unique_ptr<LocationSettings> settings) { |
| 511 location_settings_ = std::move(settings); | 511 location_settings_ = std::move(settings); |
| 512 } | 512 } |
| OLD | NEW |