OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/media/midi_permission_infobar_delegate.h" | 5 #include "chrome/browser/media/midi_permission_infobar_delegate.h" |
6 | 6 |
7 #include "chrome/browser/content_settings/permission_queue_controller.h" | 7 #include "chrome/browser/content_settings/permission_queue_controller.h" |
8 #include "chrome/browser/content_settings/permission_request_id.h" | 8 #include "chrome/browser/content_settings/permission_request_id.h" |
9 #include "chrome/browser/infobars/infobar_service.h" | 9 #include "chrome/browser/infobars/infobar_service.h" |
10 #include "components/infobars/core/infobar.h" | 10 #include "components/infobars/core/infobar.h" |
11 #include "content/public/browser/navigation_entry.h" | 11 #include "content/public/browser/navigation_entry.h" |
12 #include "content/public/browser/web_contents.h" | 12 #include "content/public/browser/web_contents.h" |
13 #include "grit/generated_resources.h" | 13 #include "grit/generated_resources.h" |
14 #include "grit/locale_settings.h" | 14 #include "grit/locale_settings.h" |
15 #include "grit/theme_resources.h" | 15 #include "grit/theme_resources.h" |
16 #include "net/base/net_util.h" | 16 #include "net/base/net_util.h" |
17 #include "ui/base/l10n/l10n_util.h" | 17 #include "ui/base/l10n/l10n_util.h" |
18 | 18 |
19 // static | 19 // static |
20 infobars::InfoBar* MidiPermissionInfoBarDelegate::Create( | 20 infobars::InfoBar* MidiPermissionInfoBarDelegate::Create( |
21 InfoBarService* infobar_service, | 21 InfoBarService* infobar_service, |
22 PermissionQueueController* controller, | 22 PermissionQueueController* controller, |
23 const PermissionRequestID& id, | 23 const PermissionRequestID& id, |
24 const GURL& requesting_frame, | 24 const GURL& requesting_frame, |
25 const std::string& display_languages) { | 25 const std::string& display_languages, |
| 26 ContentSettingsType type) { |
26 const content::NavigationEntry* committed_entry = | 27 const content::NavigationEntry* committed_entry = |
27 infobar_service->web_contents()->GetController().GetLastCommittedEntry(); | 28 infobar_service->web_contents()->GetController().GetLastCommittedEntry(); |
28 return infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar( | 29 return infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar( |
29 scoped_ptr<ConfirmInfoBarDelegate>(new MidiPermissionInfoBarDelegate( | 30 scoped_ptr<ConfirmInfoBarDelegate>(new MidiPermissionInfoBarDelegate( |
30 controller, id, requesting_frame, | 31 controller, id, requesting_frame, |
31 committed_entry ? committed_entry->GetUniqueID() : 0, | 32 committed_entry ? committed_entry->GetUniqueID() : 0, |
32 display_languages)))); | 33 display_languages, type)))); |
33 } | 34 } |
34 | 35 |
35 MidiPermissionInfoBarDelegate::MidiPermissionInfoBarDelegate( | 36 MidiPermissionInfoBarDelegate::MidiPermissionInfoBarDelegate( |
36 PermissionQueueController* controller, | 37 PermissionQueueController* controller, |
37 const PermissionRequestID& id, | 38 const PermissionRequestID& id, |
38 const GURL& requesting_frame, | 39 const GURL& requesting_frame, |
39 int contents_unique_id, | 40 int contents_unique_id, |
40 const std::string& display_languages) | 41 const std::string& display_languages, |
41 : PermissionInfobarDelegate(controller, id, requesting_frame), | 42 ContentSettingsType type) |
| 43 : PermissionInfobarDelegate(controller, id, requesting_frame, type), |
42 requesting_frame_(requesting_frame), | 44 requesting_frame_(requesting_frame), |
43 display_languages_(display_languages) { | 45 display_languages_(display_languages) { |
44 } | 46 } |
45 | 47 |
46 MidiPermissionInfoBarDelegate::~MidiPermissionInfoBarDelegate() { | 48 MidiPermissionInfoBarDelegate::~MidiPermissionInfoBarDelegate() { |
47 } | 49 } |
48 | 50 |
49 int MidiPermissionInfoBarDelegate::GetIconID() const { | 51 int MidiPermissionInfoBarDelegate::GetIconID() const { |
50 return IDR_INFOBAR_MIDI; | 52 return IDR_INFOBAR_MIDI; |
51 } | 53 } |
52 | 54 |
53 base::string16 MidiPermissionInfoBarDelegate::GetMessageText() const { | 55 base::string16 MidiPermissionInfoBarDelegate::GetMessageText() const { |
54 return l10n_util::GetStringFUTF16( | 56 return l10n_util::GetStringFUTF16( |
55 IDS_MIDI_SYSEX_INFOBAR_QUESTION, | 57 IDS_MIDI_SYSEX_INFOBAR_QUESTION, |
56 net::FormatUrl(requesting_frame_.GetOrigin(), display_languages_, | 58 net::FormatUrl(requesting_frame_.GetOrigin(), display_languages_, |
57 net::kFormatUrlOmitUsernamePassword | | 59 net::kFormatUrlOmitUsernamePassword | |
58 net::kFormatUrlOmitTrailingSlashOnBareHostname, | 60 net::kFormatUrlOmitTrailingSlashOnBareHostname, |
59 net::UnescapeRule::SPACES, NULL, NULL, NULL)); | 61 net::UnescapeRule::SPACES, NULL, NULL, NULL)); |
60 } | 62 } |
OLD | NEW |