| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/chrome_geolocation_permission_context.h" | 5 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h" |
| 6 | 6 |
| 7 #include <functional> | 7 #include <functional> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 211 const char kGeolocationLearnMoreUrl[] = | 211 const char kGeolocationLearnMoreUrl[] = |
| 212 #if defined(OS_CHROMEOS) | 212 #if defined(OS_CHROMEOS) |
| 213 "https://www.google.com/support/chromeos/bin/answer.py?answer=142065"; | 213 "https://www.google.com/support/chromeos/bin/answer.py?answer=142065"; |
| 214 #else | 214 #else |
| 215 "https://www.google.com/support/chrome/bin/answer.py?answer=142065"; | 215 "https://www.google.com/support/chrome/bin/answer.py?answer=142065"; |
| 216 #endif | 216 #endif |
| 217 | 217 |
| 218 owner()->tab_contents()->OpenURL( | 218 owner()->tab_contents()->OpenURL( |
| 219 google_util::AppendGoogleLocaleParam(GURL(kGeolocationLearnMoreUrl)), | 219 google_util::AppendGoogleLocaleParam(GURL(kGeolocationLearnMoreUrl)), |
| 220 GURL(), (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition, | 220 GURL(), (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition, |
| 221 PageTransition::LINK); | 221 content::PAGE_TRANSITION_LINK); |
| 222 return false; // Do not dismiss the info bar. | 222 return false; // Do not dismiss the info bar. |
| 223 } | 223 } |
| 224 | 224 |
| 225 } // namespace | 225 } // namespace |
| 226 | 226 |
| 227 | 227 |
| 228 // GeolocationInfoBarQueueController::PendingInfoBarRequest ------------------- | 228 // GeolocationInfoBarQueueController::PendingInfoBarRequest ------------------- |
| 229 | 229 |
| 230 struct GeolocationInfoBarQueueController::PendingInfoBarRequest { | 230 struct GeolocationInfoBarQueueController::PendingInfoBarRequest { |
| 231 public: | 231 public: |
| (...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 636 BrowserThread::UI, FROM_HERE, | 636 BrowserThread::UI, FROM_HERE, |
| 637 base::Bind( | 637 base::Bind( |
| 638 &ChromeGeolocationPermissionContext::CancelPendingInfoBarRequest, | 638 &ChromeGeolocationPermissionContext::CancelPendingInfoBarRequest, |
| 639 this, render_process_id, render_view_id, bridge_id)); | 639 this, render_process_id, render_view_id, bridge_id)); |
| 640 return; | 640 return; |
| 641 } | 641 } |
| 642 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 642 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 643 geolocation_infobar_queue_controller_->CancelInfoBarRequest(render_process_id, | 643 geolocation_infobar_queue_controller_->CancelInfoBarRequest(render_process_id, |
| 644 render_view_id, bridge_id); | 644 render_view_id, bridge_id); |
| 645 } | 645 } |
| OLD | NEW |