| Index: chrome/browser/ui/website_settings/permission_bubble_manager.cc
|
| diff --git a/chrome/browser/ui/website_settings/permission_bubble_manager.cc b/chrome/browser/ui/website_settings/permission_bubble_manager.cc
|
| index e54e40a2480612b167f3ce8f26f77595a096126b..96490834a7c4e7d6f45e51cc8d263d7e1d7c455c 100644
|
| --- a/chrome/browser/ui/website_settings/permission_bubble_manager.cc
|
| +++ b/chrome/browser/ui/website_settings/permission_bubble_manager.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "base/command_line.h"
|
| #include "base/metrics/user_metrics_action.h"
|
| +#include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/ui/website_settings/permission_bubble_request.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "content/public/browser/browser_thread.h"
|
| @@ -71,7 +72,7 @@ bool PermissionBubbleManager::Enabled() {
|
| switches::kDisablePermissionsBubbles))
|
| return false;
|
|
|
| - return false;
|
| + return true;
|
| }
|
|
|
| PermissionBubbleManager::PermissionBubbleManager(
|
| @@ -101,6 +102,7 @@ PermissionBubbleManager::~PermissionBubbleManager() {
|
| }
|
|
|
| void PermissionBubbleManager::AddRequest(PermissionBubbleRequest* request) {
|
| +LOG(INFO) << "!!! AddRequest " << request->GetMessageText();
|
| content::RecordAction(base::UserMetricsAction("PermissionBubbleRequest"));
|
| // TODO(gbillock): is there a race between an early request on a
|
| // newly-navigated page and the to-be-cleaned-up requests on the previous
|
| @@ -271,6 +273,7 @@ void PermissionBubbleManager::SetCustomizationMode() {
|
| }
|
|
|
| void PermissionBubbleManager::Accept() {
|
| +LOG(INFO) << "Accept bubble in MGR";
|
| std::vector<PermissionBubbleRequest*>::iterator requests_iter;
|
| std::vector<bool>::iterator accepts_iter = accept_states_.begin();
|
| for (requests_iter = requests_.begin(), accepts_iter = accept_states_.begin();
|
| @@ -313,12 +316,17 @@ void PermissionBubbleManager::ScheduleShowBubble() {
|
| }
|
|
|
| void PermissionBubbleManager::TriggerShowBubble() {
|
| - if (!view_)
|
| +LOG(INFO) << "TriggerShowBubble";
|
| + if (!view_) {
|
| +LOG(INFO) << "no view";
|
| return;
|
| + }
|
| if (bubble_showing_)
|
| return;
|
| - if (!request_url_has_loaded_)
|
| + if (!request_url_has_loaded_) {
|
| +LOG(INFO) << "not loaded";
|
| return;
|
| + }
|
| if (requests_.empty() && queued_requests_.empty() &&
|
| queued_frame_requests_.empty()) {
|
| return;
|
| @@ -342,6 +350,7 @@ void PermissionBubbleManager::TriggerShowBubble() {
|
| accept_states_.resize(requests_.size(), true);
|
| }
|
|
|
| +LOG(INFO) << "showing bubble view";
|
| // Note: this should appear above Show() for testing, since in that
|
| // case we may do in-line calling of finalization.
|
| bubble_showing_ = true;
|
|
|