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.h" | |
10 #include "chrome/browser/infobars/infobar_service.h" | 9 #include "chrome/browser/infobars/infobar_service.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 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 const content::NavigationEntry* committed_entry = | 26 const content::NavigationEntry* committed_entry = |
27 infobar_service->web_contents()->GetController().GetLastCommittedEntry(); | 27 infobar_service->web_contents()->GetController().GetLastCommittedEntry(); |
28 return infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar( | 28 return infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar( |
29 scoped_ptr<ConfirmInfoBarDelegate>(new MidiPermissionInfoBarDelegate( | 29 scoped_ptr<ConfirmInfoBarDelegate>(new MidiPermissionInfoBarDelegate( |
30 controller, id, requesting_frame, | 30 controller, id, requesting_frame, |
(...skipping 19 matching lines...) Expand all Loading... |
50 } | 50 } |
51 | 51 |
52 void MidiPermissionInfoBarDelegate::InfoBarDismissed() { | 52 void MidiPermissionInfoBarDelegate::InfoBarDismissed() { |
53 SetPermission(false, false); | 53 SetPermission(false, false); |
54 } | 54 } |
55 | 55 |
56 int MidiPermissionInfoBarDelegate::GetIconID() const { | 56 int MidiPermissionInfoBarDelegate::GetIconID() const { |
57 return IDR_INFOBAR_MIDI; | 57 return IDR_INFOBAR_MIDI; |
58 } | 58 } |
59 | 59 |
60 InfoBarDelegate::Type MidiPermissionInfoBarDelegate::GetInfoBarType() const { | 60 infobars::InfoBarDelegate::Type MidiPermissionInfoBarDelegate::GetInfoBarType() |
| 61 const { |
61 return PAGE_ACTION_TYPE; | 62 return PAGE_ACTION_TYPE; |
62 } | 63 } |
63 | 64 |
64 bool MidiPermissionInfoBarDelegate::ShouldExpireInternal( | 65 bool MidiPermissionInfoBarDelegate::ShouldExpireInternal( |
65 const NavigationDetails& details) const { | 66 const NavigationDetails& details) const { |
66 // This implementation matches InfoBarDelegate::ShouldExpireInternal(), but | 67 // This implementation matches InfoBarDelegate::ShouldExpireInternal(), but |
67 // uses the unique ID we set in the constructor instead of that stored in the | 68 // uses the unique ID we set in the constructor instead of that stored in the |
68 // base class. | 69 // base class. |
69 return (contents_unique_id_ != details.entry_id) || details.is_reload; | 70 return (contents_unique_id_ != details.entry_id) || details.is_reload; |
70 } | 71 } |
(...skipping 20 matching lines...) Expand all Loading... |
91 return true; | 92 return true; |
92 } | 93 } |
93 | 94 |
94 void MidiPermissionInfoBarDelegate::SetPermission(bool update_content_setting, | 95 void MidiPermissionInfoBarDelegate::SetPermission(bool update_content_setting, |
95 bool allowed) { | 96 bool allowed) { |
96 content::WebContents* web_contents = | 97 content::WebContents* web_contents = |
97 InfoBarService::WebContentsFromInfoBar(infobar()); | 98 InfoBarService::WebContentsFromInfoBar(infobar()); |
98 controller_->OnPermissionSet(id_, requesting_frame_, web_contents->GetURL(), | 99 controller_->OnPermissionSet(id_, requesting_frame_, web_contents->GetURL(), |
99 update_content_setting, allowed); | 100 update_content_setting, allowed); |
100 } | 101 } |
OLD | NEW |