OLD | NEW |
---|---|
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/permissions/permission_prompt_android.h" | 5 #include "chrome/browser/permissions/permission_prompt_android.h" |
6 | 6 |
7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
8 #include "chrome/browser/infobars/infobar_service.h" | 8 #include "chrome/browser/infobars/infobar_service.h" |
dominickn
2017/03/17 01:45:25
This is now unused.
Timothy Loh
2017/03/17 02:34:21
This is used in Show(). Removed the other unused o
| |
9 #include "chrome/browser/media/webrtc/media_stream_devices_controller.h" | 9 #include "chrome/browser/media/webrtc/media_stream_devices_controller.h" |
dominickn
2017/03/17 01:45:26
I don't think this header is used?
| |
10 #include "chrome/browser/permissions/grouped_permission_infobar_delegate_android .h" | 10 #include "chrome/browser/permissions/grouped_permission_infobar_delegate_android .h" |
11 #include "chrome/browser/permissions/permission_request.h" | 11 #include "chrome/browser/permissions/permission_request.h" |
12 #include "chrome/browser/permissions/permission_request_id.h" | 12 #include "chrome/browser/permissions/permission_request_id.h" |
13 #include "components/infobars/core/infobar.h" | 13 #include "components/infobars/core/infobar.h" |
dominickn
2017/03/17 01:45:26
Not used?
| |
14 #include "content/public/browser/web_contents.h" | 14 #include "content/public/browser/web_contents.h" |
dominickn
2017/03/17 01:45:25
We don't actually call any methods on WebContents
| |
15 | 15 |
16 PermissionPromptAndroid::PermissionPromptAndroid( | 16 PermissionPromptAndroid::PermissionPromptAndroid( |
17 content::WebContents* web_contents) | 17 content::WebContents* web_contents) |
18 : web_contents_(web_contents), delegate_(nullptr), infobar_(nullptr) { | 18 : web_contents_(web_contents), delegate_(nullptr) { |
19 DCHECK(web_contents); | 19 DCHECK(web_contents); |
20 } | 20 } |
21 | 21 |
22 PermissionPromptAndroid::~PermissionPromptAndroid() { | 22 PermissionPromptAndroid::~PermissionPromptAndroid() {} |
23 if (infobar_) { | |
24 GroupedPermissionInfoBarDelegate* infobar_delegate = | |
25 static_cast<GroupedPermissionInfoBarDelegate*>(infobar_->delegate()); | |
26 infobar_delegate->PermissionPromptDestroyed(); | |
27 } | |
28 } | |
29 | 23 |
30 void PermissionPromptAndroid::SetDelegate(Delegate* delegate) { | 24 void PermissionPromptAndroid::SetDelegate(Delegate* delegate) { |
31 delegate_ = delegate; | 25 delegate_ = delegate; |
32 } | 26 } |
33 | 27 |
34 void PermissionPromptAndroid::Show( | 28 void PermissionPromptAndroid::Show( |
35 const std::vector<PermissionRequest*>& requests, | 29 const std::vector<PermissionRequest*>& requests, |
36 const std::vector<bool>& values) { | 30 const std::vector<bool>& values) { |
37 InfoBarService* infobar_service = | 31 InfoBarService* infobar_service = |
38 InfoBarService::FromWebContents(web_contents_); | 32 InfoBarService::FromWebContents(web_contents_); |
39 if (!infobar_service) | 33 if (!infobar_service) |
40 return; | 34 return; |
41 | 35 |
42 requests_ = requests; | 36 requests_ = requests; |
43 infobar_ = GroupedPermissionInfoBarDelegate::Create(this, infobar_service, | 37 GroupedPermissionInfoBarDelegate::Create(this, infobar_service, |
44 requests[0]->GetOrigin()); | 38 requests[0]->GetOrigin()); |
45 } | 39 } |
46 | 40 |
47 bool PermissionPromptAndroid::CanAcceptRequestUpdate() { | 41 bool PermissionPromptAndroid::CanAcceptRequestUpdate() { |
48 return false; | 42 return false; |
49 } | 43 } |
50 | 44 |
51 void PermissionPromptAndroid::Hide() { | 45 void PermissionPromptAndroid::Hide() { |
52 InfoBarService* infobar_service = | 46 // No-op. Hide() is called in three cases: |
53 InfoBarService::FromWebContents(web_contents_); | 47 // - After the user resolves a prompt. The infobar manager will hide the |
54 if (infobar_ && infobar_service) { | 48 // prompt for us. |
55 infobar_service->RemoveInfoBar(infobar_); | 49 // - DidFinishNavigation, etc. The infobar manager handles this. |
56 } | 50 // - PermissionManager::CancelRequest(). As CanAcceptRequestUpdate() returns |
57 infobar_ = nullptr; | 51 // false, it doesn't call into here and instead dummies out the callbacks. |
58 } | 52 } |
59 | 53 |
60 bool PermissionPromptAndroid::IsVisible() { | 54 bool PermissionPromptAndroid::IsVisible() { |
61 return infobar_ != nullptr; | 55 return !requests_.empty(); |
62 } | 56 } |
63 | 57 |
64 void PermissionPromptAndroid::UpdateAnchorPosition() { | 58 void PermissionPromptAndroid::UpdateAnchorPosition() { |
65 NOTREACHED() << "UpdateAnchorPosition is not implemented"; | 59 NOTREACHED() << "UpdateAnchorPosition is not implemented"; |
66 } | 60 } |
67 | 61 |
68 gfx::NativeWindow PermissionPromptAndroid::GetNativeWindow() { | 62 gfx::NativeWindow PermissionPromptAndroid::GetNativeWindow() { |
69 NOTREACHED() << "GetNativeWindow is not implemented"; | 63 NOTREACHED() << "GetNativeWindow is not implemented"; |
70 return nullptr; | 64 return nullptr; |
71 } | 65 } |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
108 size_t position) const { | 102 size_t position) const { |
109 DCHECK_LT(position, requests_.size()); | 103 DCHECK_LT(position, requests_.size()); |
110 return requests_[position]->GetMessageTextFragment(); | 104 return requests_[position]->GetMessageTextFragment(); |
111 } | 105 } |
112 | 106 |
113 // static | 107 // static |
114 std::unique_ptr<PermissionPrompt> PermissionPrompt::Create( | 108 std::unique_ptr<PermissionPrompt> PermissionPrompt::Create( |
115 content::WebContents* web_contents) { | 109 content::WebContents* web_contents) { |
116 return base::MakeUnique<PermissionPromptAndroid>(web_contents); | 110 return base::MakeUnique<PermissionPromptAndroid>(web_contents); |
117 } | 111 } |
OLD | NEW |