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 "grit/generated_resources.h" | 11 #include "grit/generated_resources.h" |
11 #include "grit/theme_resources.h" | 12 #include "grit/theme_resources.h" |
12 #include "net/base/net_util.h" | |
13 #include "ui/base/l10n/l10n_util.h" | 13 #include "ui/base/l10n/l10n_util.h" |
14 | 14 |
15 | 15 |
16 // static | 16 // static |
17 infobars::InfoBar* GeolocationInfoBarDelegate::Create( | 17 infobars::InfoBar* GeolocationInfoBarDelegate::Create( |
18 InfoBarService* infobar_service, | 18 InfoBarService* infobar_service, |
19 PermissionQueueController* controller, | 19 PermissionQueueController* controller, |
20 const PermissionRequestID& id, | 20 const PermissionRequestID& id, |
21 const GURL& requesting_frame, | 21 const GURL& requesting_frame, |
22 const std::string& display_languages) { | 22 const std::string& display_languages) { |
(...skipping 14 matching lines...) Expand all Loading... |
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(IDS_GEOLOCATION_INFOBAR_QUESTION, | 47 return l10n_util::GetStringFUTF16( |
48 net::FormatUrl(requesting_frame_, display_languages_, | 48 IDS_GEOLOCATION_INFOBAR_QUESTION, |
49 net::kFormatUrlOmitUsernamePassword | | 49 url_formatter::FormatUrl( |
50 net::kFormatUrlOmitTrailingSlashOnBareHostname, | 50 requesting_frame_, display_languages_, |
51 net::UnescapeRule::SPACES, NULL, NULL, NULL)); | 51 url_formatter::kFormatUrlOmitUsernamePassword | |
| 52 url_formatter::kFormatUrlOmitTrailingSlashOnBareHostname, |
| 53 net::UnescapeRule::SPACES, nullptr, nullptr, nullptr)); |
52 } | 54 } |
OLD | NEW |