OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/services/gcm/push_messaging_infobar_delegate.h" | 5 #include "chrome/browser/services/gcm/push_messaging_infobar_delegate.h" |
6 | 6 |
7 #include "components/infobars/core/infobar.h" | 7 #include "components/infobars/core/infobar.h" |
8 #include "grit/generated_resources.h" | 8 #include "grit/generated_resources.h" |
9 #include "net/base/net_util.h" | 9 #include "net/base/net_util.h" |
10 #include "ui/base/l10n/l10n_util.h" | 10 #include "ui/base/l10n/l10n_util.h" |
(...skipping 22 matching lines...) Expand all Loading... |
33 : PermissionInfobarDelegate(controller, id, requesting_frame), | 33 : PermissionInfobarDelegate(controller, id, requesting_frame), |
34 requesting_origin_(requesting_frame.GetOrigin()), | 34 requesting_origin_(requesting_frame.GetOrigin()), |
35 display_languages_(display_languages) { | 35 display_languages_(display_languages) { |
36 } | 36 } |
37 | 37 |
38 PushMessagingInfoBarDelegate::~PushMessagingInfoBarDelegate() { | 38 PushMessagingInfoBarDelegate::~PushMessagingInfoBarDelegate() { |
39 } | 39 } |
40 | 40 |
41 base::string16 PushMessagingInfoBarDelegate::GetMessageText() const { | 41 base::string16 PushMessagingInfoBarDelegate::GetMessageText() const { |
42 return l10n_util::GetStringFUTF16( | 42 return l10n_util::GetStringFUTF16( |
43 IDS_PUSH_MESSAGES_PERMISSION_QUESTION, | 43 IDS_PUSH_MESSAGES_PERMISSION_QUESTION, |
44 net::FormatUrl(requesting_origin_, display_languages_)); | 44 net::FormatUrl(requesting_origin_, display_languages_, |
| 45 net::kFormatUrlOmitUsernamePassword | |
| 46 net::kFormatUrlOmitTrailingSlashOnBareHostname, |
| 47 net::UnescapeRule::SPACES, NULL, NULL, NULL)); |
45 } | 48 } |
46 | 49 |
47 } // namespace gcm | 50 } // namespace gcm |
OLD | NEW |