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

Unified Diff: trunk/src/chrome/browser/ui/website_settings/permission_bubble_manager.cc

Issue 167533003: Revert 251397 "[WebsiteSettings] Fix bug in permission bubble ma..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | trunk/src/chrome/browser/ui/website_settings/permission_bubble_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/browser/ui/website_settings/permission_bubble_manager.cc
===================================================================
--- trunk/src/chrome/browser/ui/website_settings/permission_bubble_manager.cc (revision 251413)
+++ trunk/src/chrome/browser/ui/website_settings/permission_bubble_manager.cc (working copy)
@@ -162,15 +162,17 @@
void PermissionBubbleManager::ShowBubble() {
if (view_ && !bubble_showing_ && requests_.size()) {
+ view_->SetDelegate(this);
view_->Show(requests_, accept_states_, customization_mode_);
bubble_showing_ = true;
}
}
void PermissionBubbleManager::FinalizeBubble() {
- if (view_)
+ if (view_) {
+ view_->SetDelegate(NULL);
view_->Hide();
- bubble_showing_ = false;
+ }
std::vector<PermissionBubbleRequest*>::iterator requests_iter;
for (requests_iter = requests_.begin();
@@ -180,6 +182,7 @@
}
requests_.clear();
accept_states_.clear();
+ bubble_showing_ = false;
if (queued_requests_.size()) {
requests_ = queued_requests_;
accept_states_.resize(requests_.size(), true);
« no previous file with comments | « no previous file | trunk/src/chrome/browser/ui/website_settings/permission_bubble_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698