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/permissions/permission_request_manager.h" | 5 #include "chrome/browser/permissions/permission_request_manager.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/feature_list.h" | 10 #include "base/feature_list.h" |
11 #include "base/metrics/user_metrics.h" | 11 #include "base/metrics/user_metrics.h" |
12 #include "base/metrics/user_metrics_action.h" | 12 #include "base/metrics/user_metrics_action.h" |
13 #include "build/build_config.h" | 13 #include "build/build_config.h" |
14 #include "chrome/browser/permissions/permission_request.h" | 14 #include "chrome/browser/permissions/permission_request.h" |
15 #include "chrome/browser/permissions/permission_uma_util.h" | 15 #include "chrome/browser/permissions/permission_uma_util.h" |
16 #include "chrome/browser/ui/permission_bubble/permission_prompt.h" | 16 #include "chrome/browser/ui/permission_bubble/permission_prompt.h" |
17 #include "chrome/common/chrome_features.h" | 17 #include "chrome/common/chrome_features.h" |
18 #include "chrome/common/chrome_switches.h" | 18 #include "chrome/common/chrome_switches.h" |
19 #include "content/public/browser/browser_thread.h" | 19 #include "content/public/browser/browser_thread.h" |
20 #include "content/public/browser/navigation_handle.h" | 20 #include "content/public/browser/navigation_handle.h" |
21 #include "url/origin.h" | 21 #include "url/origin.h" |
22 | 22 |
23 namespace { | 23 namespace { |
24 | 24 |
25 class CancelledRequest : public PermissionRequest { | 25 class CancelledRequest : public PermissionRequest { |
26 public: | 26 public: |
27 explicit CancelledRequest(PermissionRequest* cancelled) | 27 explicit CancelledRequest(PermissionRequest* cancelled) |
28 : icon_(cancelled->GetIconId()), | 28 : icon_(cancelled->GetIconId()), |
| 29 #if defined(OS_ANDROID) |
| 30 message_(cancelled->GetMessageText()), |
| 31 #endif |
29 message_fragment_(cancelled->GetMessageTextFragment()), | 32 message_fragment_(cancelled->GetMessageTextFragment()), |
30 origin_(cancelled->GetOrigin()) {} | 33 origin_(cancelled->GetOrigin()) { |
| 34 } |
31 ~CancelledRequest() override {} | 35 ~CancelledRequest() override {} |
32 | 36 |
33 IconId GetIconId() const override { return icon_; } | 37 IconId GetIconId() const override { return icon_; } |
| 38 #if defined(OS_ANDROID) |
| 39 base::string16 GetMessageText() const override { return message_; } |
| 40 #endif |
34 base::string16 GetMessageTextFragment() const override { | 41 base::string16 GetMessageTextFragment() const override { |
35 return message_fragment_; | 42 return message_fragment_; |
36 } | 43 } |
37 GURL GetOrigin() const override { return origin_; } | 44 GURL GetOrigin() const override { return origin_; } |
38 | 45 |
39 // These are all no-ops since the placeholder is non-forwarding. | 46 // These are all no-ops since the placeholder is non-forwarding. |
40 void PermissionGranted() override {} | 47 void PermissionGranted() override {} |
41 void PermissionDenied() override {} | 48 void PermissionDenied() override {} |
42 void Cancelled() override {} | 49 void Cancelled() override {} |
43 | 50 |
44 void RequestFinished() override { delete this; } | 51 void RequestFinished() override { delete this; } |
45 | 52 |
46 private: | 53 private: |
47 IconId icon_; | 54 IconId icon_; |
| 55 #if defined(OS_ANDROID) |
| 56 base::string16 message_; |
| 57 #endif |
48 base::string16 message_fragment_; | 58 base::string16 message_fragment_; |
49 GURL origin_; | 59 GURL origin_; |
50 }; | 60 }; |
51 | 61 |
52 bool IsMessageTextEqual(PermissionRequest* a, | 62 bool IsMessageTextEqual(PermissionRequest* a, |
53 PermissionRequest* b) { | 63 PermissionRequest* b) { |
54 if (a == b) | 64 if (a == b) |
55 return true; | 65 return true; |
56 if (a->GetMessageTextFragment() == b->GetMessageTextFragment() && | 66 if (a->GetMessageTextFragment() == b->GetMessageTextFragment() && |
57 a->GetOrigin() == b->GetOrigin()) { | 67 a->GetOrigin() == b->GetOrigin()) { |
(...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
543 Accept(); | 553 Accept(); |
544 } | 554 } |
545 break; | 555 break; |
546 case DISMISS: | 556 case DISMISS: |
547 Closing(); | 557 Closing(); |
548 break; | 558 break; |
549 case NONE: | 559 case NONE: |
550 NOTREACHED(); | 560 NOTREACHED(); |
551 } | 561 } |
552 } | 562 } |
OLD | NEW |