| 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_infobar_delegate.h" | 5 #include "chrome/browser/geolocation/geolocation_infobar_delegate.h" |
| 6 | 6 |
| 7 #include "chrome/browser/infobars/infobar_service.h" | 7 #include "chrome/browser/infobars/infobar_service.h" |
| 8 #include "chrome/grit/generated_resources.h" | 8 #include "chrome/grit/generated_resources.h" |
| 9 #include "components/infobars/core/infobar.h" | 9 #include "components/infobars/core/infobar.h" |
| 10 #include "components/url_formatter/url_formatter.h" | 10 #include "components/url_formatter/url_formatter.h" |
| 11 #include "grit/generated_resources.h" | 11 #include "grit/generated_resources.h" |
| 12 #include "grit/theme_resources.h" | 12 #include "grit/theme_resources.h" |
| 13 #include "ui/base/l10n/l10n_util.h" | 13 #include "ui/base/l10n/l10n_util.h" |
| 14 | 14 |
| 15 | |
| 16 // static | 15 // static |
| 17 infobars::InfoBar* GeolocationInfoBarDelegate::Create( | 16 infobars::InfoBar* GeolocationInfoBarDelegate::Create( |
| 18 InfoBarService* infobar_service, | 17 InfoBarService* infobar_service, |
| 19 PermissionQueueController* controller, | |
| 20 const PermissionRequestID& id, | 18 const PermissionRequestID& id, |
| 21 const GURL& requesting_frame, | 19 const GURL& requesting_frame, |
| 22 const std::string& display_languages) { | 20 const std::string& display_languages, |
| 21 const base::Callback<void(bool, bool)>& callback) { |
| 23 return infobar_service->AddInfoBar(infobar_service->CreateConfirmInfoBar( | 22 return infobar_service->AddInfoBar(infobar_service->CreateConfirmInfoBar( |
| 24 scoped_ptr<ConfirmInfoBarDelegate>(new GeolocationInfoBarDelegate( | 23 scoped_ptr<ConfirmInfoBarDelegate>(new GeolocationInfoBarDelegate( |
| 25 controller, id, requesting_frame, display_languages)))); | 24 id, requesting_frame, display_languages, callback)))); |
| 26 } | 25 } |
| 27 | 26 |
| 28 GeolocationInfoBarDelegate::GeolocationInfoBarDelegate( | 27 GeolocationInfoBarDelegate::GeolocationInfoBarDelegate( |
| 29 PermissionQueueController* controller, | |
| 30 const PermissionRequestID& id, | 28 const PermissionRequestID& id, |
| 31 const GURL& requesting_frame, | 29 const GURL& requesting_frame, |
| 32 const std::string& display_languages) | 30 const std::string& display_languages, |
| 33 : PermissionInfobarDelegate(controller, id, requesting_frame, | 31 const base::Callback<void(bool, bool)>& callback) |
| 34 CONTENT_SETTINGS_TYPE_GEOLOCATION), | 32 : PermissionInfobarDelegate(id, requesting_frame, |
| 33 CONTENT_SETTINGS_TYPE_GEOLOCATION, |
| 34 callback), |
| 35 requesting_frame_(requesting_frame), | 35 requesting_frame_(requesting_frame), |
| 36 display_languages_(display_languages) { | 36 display_languages_(display_languages) { |
| 37 } | 37 } |
| 38 | 38 |
| 39 GeolocationInfoBarDelegate::~GeolocationInfoBarDelegate() { | 39 GeolocationInfoBarDelegate::~GeolocationInfoBarDelegate() { |
| 40 } | 40 } |
| 41 | 41 |
| 42 int GeolocationInfoBarDelegate::GetIconId() const { | 42 int GeolocationInfoBarDelegate::GetIconId() const { |
| 43 return IDR_INFOBAR_GEOLOCATION; | 43 return IDR_INFOBAR_GEOLOCATION; |
| 44 } | 44 } |
| 45 | 45 |
| 46 base::string16 GeolocationInfoBarDelegate::GetMessageText() const { | 46 base::string16 GeolocationInfoBarDelegate::GetMessageText() const { |
| 47 return l10n_util::GetStringFUTF16( | 47 return l10n_util::GetStringFUTF16( |
| 48 IDS_GEOLOCATION_INFOBAR_QUESTION, | 48 IDS_GEOLOCATION_INFOBAR_QUESTION, |
| 49 url_formatter::FormatUrl( | 49 url_formatter::FormatUrl( |
| 50 requesting_frame_, display_languages_, | 50 requesting_frame_, display_languages_, |
| 51 url_formatter::kFormatUrlOmitUsernamePassword | | 51 url_formatter::kFormatUrlOmitUsernamePassword | |
| 52 url_formatter::kFormatUrlOmitTrailingSlashOnBareHostname, | 52 url_formatter::kFormatUrlOmitTrailingSlashOnBareHostname, |
| 53 net::UnescapeRule::SPACES, nullptr, nullptr, nullptr)); | 53 net::UnescapeRule::SPACES, nullptr, nullptr, nullptr)); |
| 54 } | 54 } |
| OLD | NEW |