OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <set> | 5 #include <set> |
6 #include <string> | 6 #include <string> |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/hash_tables.h" | 10 #include "base/hash_tables.h" |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 | 45 |
46 // We need to track which infobars were closed. | 46 // We need to track which infobars were closed. |
47 class ClosedDelegateTracker : public content::NotificationObserver { | 47 class ClosedDelegateTracker : public content::NotificationObserver { |
48 public: | 48 public: |
49 ClosedDelegateTracker(); | 49 ClosedDelegateTracker(); |
50 virtual ~ClosedDelegateTracker(); | 50 virtual ~ClosedDelegateTracker(); |
51 | 51 |
52 // content::NotificationObserver: | 52 // content::NotificationObserver: |
53 virtual void Observe(int type, | 53 virtual void Observe(int type, |
54 const content::NotificationSource& source, | 54 const content::NotificationSource& source, |
55 const content::NotificationDetails& details); | 55 const content::NotificationDetails& details) OVERRIDE; |
56 | 56 |
57 size_t size() const { | 57 size_t size() const { |
58 return removed_infobar_delegates_.size(); | 58 return removed_infobar_delegates_.size(); |
59 } | 59 } |
60 | 60 |
61 bool Contains(InfoBarDelegate* delegate) const; | 61 bool Contains(InfoBarDelegate* delegate) const; |
62 void Clear(); | 62 void Clear(); |
63 | 63 |
64 private: | 64 private: |
65 FRIEND_TEST_ALL_PREFIXES(GeolocationPermissionContextTests, TabDestroyed); | 65 FRIEND_TEST_ALL_PREFIXES(GeolocationPermissionContextTests, TabDestroyed); |
(...skipping 634 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
700 details.entry = web_contents()->GetController().GetLastCommittedEntry(); | 700 details.entry = web_contents()->GetController().GetLastCommittedEntry(); |
701 EXPECT_FALSE(infobar_0->ShouldExpire(details)); | 701 EXPECT_FALSE(infobar_0->ShouldExpire(details)); |
702 // Ensure the infobar will expire when we commit the pending navigation. | 702 // Ensure the infobar will expire when we commit the pending navigation. |
703 details.entry = web_contents()->GetController().GetActiveEntry(); | 703 details.entry = web_contents()->GetController().GetActiveEntry(); |
704 EXPECT_TRUE(infobar_0->ShouldExpire(details)); | 704 EXPECT_TRUE(infobar_0->ShouldExpire(details)); |
705 | 705 |
706 // Delete the tab contents. | 706 // Delete the tab contents. |
707 DeleteContents(); | 707 DeleteContents(); |
708 delete infobar_0; | 708 delete infobar_0; |
709 } | 709 } |
OLD | NEW |