Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(151)

Side by Side Diff: chrome/browser/media/midi_permission_infobar_delegate.cc

Issue 1142153002: Simplify infobar expiry. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Android compile Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
8 #include "chrome/browser/infobars/infobar_service.h" 7 #include "chrome/browser/infobars/infobar_service.h"
9 #include "chrome/grit/generated_resources.h" 8 #include "chrome/grit/generated_resources.h"
10 #include "chrome/grit/locale_settings.h"
11 #include "components/content_settings/core/common/permission_request_id.h"
12 #include "components/infobars/core/infobar.h" 9 #include "components/infobars/core/infobar.h"
13 #include "content/public/browser/navigation_entry.h"
14 #include "content/public/browser/web_contents.h"
15 #include "grit/theme_resources.h" 10 #include "grit/theme_resources.h"
16 #include "net/base/net_util.h" 11 #include "net/base/net_util.h"
17 #include "ui/base/l10n/l10n_util.h" 12 #include "ui/base/l10n/l10n_util.h"
18 13
19 // static 14 // static
20 infobars::InfoBar* MidiPermissionInfoBarDelegate::Create( 15 infobars::InfoBar* MidiPermissionInfoBarDelegate::Create(
21 InfoBarService* infobar_service, 16 InfoBarService* infobar_service,
22 PermissionQueueController* controller, 17 PermissionQueueController* controller,
23 const PermissionRequestID& id, 18 const PermissionRequestID& id,
24 const GURL& requesting_frame, 19 const GURL& requesting_frame,
25 const std::string& display_languages, 20 const std::string& display_languages,
26 ContentSettingsType type) { 21 ContentSettingsType type) {
27 const content::NavigationEntry* committed_entry =
28 infobar_service->web_contents()->GetController().GetLastCommittedEntry();
29 return infobar_service->AddInfoBar(infobar_service->CreateConfirmInfoBar( 22 return infobar_service->AddInfoBar(infobar_service->CreateConfirmInfoBar(
30 scoped_ptr<ConfirmInfoBarDelegate>(new MidiPermissionInfoBarDelegate( 23 scoped_ptr<ConfirmInfoBarDelegate>(new MidiPermissionInfoBarDelegate(
31 controller, id, requesting_frame, 24 controller, id, requesting_frame, display_languages, type))));
32 committed_entry ? committed_entry->GetUniqueID() : 0,
33 display_languages, type))));
34 } 25 }
35 26
36 MidiPermissionInfoBarDelegate::MidiPermissionInfoBarDelegate( 27 MidiPermissionInfoBarDelegate::MidiPermissionInfoBarDelegate(
37 PermissionQueueController* controller, 28 PermissionQueueController* controller,
38 const PermissionRequestID& id, 29 const PermissionRequestID& id,
39 const GURL& requesting_frame, 30 const GURL& requesting_frame,
40 int contents_unique_id,
41 const std::string& display_languages, 31 const std::string& display_languages,
42 ContentSettingsType type) 32 ContentSettingsType type)
43 : PermissionInfobarDelegate(controller, id, requesting_frame, type), 33 : PermissionInfobarDelegate(controller, id, requesting_frame, type),
44 requesting_frame_(requesting_frame), 34 requesting_frame_(requesting_frame),
45 display_languages_(display_languages) { 35 display_languages_(display_languages) {
46 } 36 }
47 37
48 MidiPermissionInfoBarDelegate::~MidiPermissionInfoBarDelegate() { 38 MidiPermissionInfoBarDelegate::~MidiPermissionInfoBarDelegate() {
49 } 39 }
50 40
51 int MidiPermissionInfoBarDelegate::GetIconID() const { 41 int MidiPermissionInfoBarDelegate::GetIconID() const {
52 return IDR_INFOBAR_MIDI; 42 return IDR_INFOBAR_MIDI;
53 } 43 }
54 44
55 base::string16 MidiPermissionInfoBarDelegate::GetMessageText() const { 45 base::string16 MidiPermissionInfoBarDelegate::GetMessageText() const {
56 return l10n_util::GetStringFUTF16( 46 return l10n_util::GetStringFUTF16(
57 IDS_MIDI_SYSEX_INFOBAR_QUESTION, 47 IDS_MIDI_SYSEX_INFOBAR_QUESTION,
58 net::FormatUrl(requesting_frame_.GetOrigin(), display_languages_, 48 net::FormatUrl(requesting_frame_.GetOrigin(), display_languages_,
59 net::kFormatUrlOmitUsernamePassword | 49 net::kFormatUrlOmitUsernamePassword |
60 net::kFormatUrlOmitTrailingSlashOnBareHostname, 50 net::kFormatUrlOmitTrailingSlashOnBareHostname,
61 net::UnescapeRule::SPACES, NULL, NULL, NULL)); 51 net::UnescapeRule::SPACES, NULL, NULL, NULL));
62 } 52 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698