OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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.h" | 5 #include "chrome/browser/geolocation/geolocation_permission_context.h" |
6 | 6 |
7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
8 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
9 #include "chrome/browser/browser.h" | 9 #include "chrome/browser/browser.h" |
10 #include "chrome/browser/chrome_thread.h" | 10 #include "chrome/browser/chrome_thread.h" |
11 #include "chrome/browser/extensions/extensions_service.h" | 11 #include "chrome/browser/extensions/extensions_service.h" |
12 #include "chrome/browser/geolocation/geolocation_content_settings_map.h" | 12 #include "chrome/browser/geolocation/geolocation_content_settings_map.h" |
13 #include "chrome/browser/geolocation/geolocation_dispatcher_host.h" | 13 #include "chrome/browser/geolocation/geolocation_dispatcher_host.h" |
| 14 #include "chrome/browser/geolocation/location_arbitrator.h" |
14 #include "chrome/browser/pref_service.h" | 15 #include "chrome/browser/pref_service.h" |
15 #include "chrome/browser/profile.h" | 16 #include "chrome/browser/profile.h" |
16 #include "chrome/browser/renderer_host/render_process_host.h" | 17 #include "chrome/browser/renderer_host/render_process_host.h" |
17 #include "chrome/browser/renderer_host/render_view_host.h" | 18 #include "chrome/browser/renderer_host/render_view_host.h" |
18 #include "chrome/browser/renderer_host/render_view_host_notification_task.h" | 19 #include "chrome/browser/renderer_host/render_view_host_notification_task.h" |
19 #include "chrome/browser/tab_contents/infobar_delegate.h" | 20 #include "chrome/browser/tab_contents/infobar_delegate.h" |
20 #include "chrome/browser/tab_contents/tab_contents.h" | 21 #include "chrome/browser/tab_contents/tab_contents.h" |
21 #include "chrome/browser/tab_contents/tab_util.h" | 22 #include "chrome/browser/tab_contents/tab_util.h" |
22 #include "chrome/common/extensions/extension.h" | 23 #include "chrome/common/extensions/extension.h" |
23 #include "chrome/common/pref_names.h" | 24 #include "chrome/common/pref_names.h" |
(...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
458 ChromeThread::UI, FROM_HERE, | 459 ChromeThread::UI, FROM_HERE, |
459 NewRunnableMethod(this, | 460 NewRunnableMethod(this, |
460 &GeolocationPermissionContext::CancelPendingInfoBarRequest, | 461 &GeolocationPermissionContext::CancelPendingInfoBarRequest, |
461 render_process_id, render_view_id, bridge_id)); | 462 render_process_id, render_view_id, bridge_id)); |
462 return; | 463 return; |
463 } | 464 } |
464 DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); | 465 DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); |
465 geolocation_infobar_queue_controller_->CancelInfoBarRequest( | 466 geolocation_infobar_queue_controller_->CancelInfoBarRequest( |
466 render_process_id, render_view_id, bridge_id); | 467 render_process_id, render_view_id, bridge_id); |
467 } | 468 } |
OLD | NEW |