| Index: chrome/browser/permissions/permission_request_manager.cc
|
| diff --git a/chrome/browser/permissions/permission_request_manager.cc b/chrome/browser/permissions/permission_request_manager.cc
|
| index 821089a3312b3781e5ebea297211f379a81b697d..4f3a2ed8dac76874732e36b16285e68756b10672 100644
|
| --- a/chrome/browser/permissions/permission_request_manager.cc
|
| +++ b/chrome/browser/permissions/permission_request_manager.cc
|
| @@ -81,10 +81,10 @@ DEFINE_WEB_CONTENTS_USER_DATA_KEY(PermissionRequestManager);
|
| PermissionRequestManager::PermissionRequestManager(
|
| content::WebContents* web_contents)
|
| : content::WebContentsObserver(web_contents),
|
| -#if !defined(OS_ANDROID) // No bubbles in android tests.
|
| +// #if !defined(OS_ANDROID) // No bubbles in android tests.
|
| view_factory_(base::Bind(&PermissionBubbleView::Create)),
|
| -#endif
|
| - view_(nullptr),
|
| +// #endif
|
| +// view_(nullptr),
|
| main_frame_has_fully_loaded_(false),
|
| auto_response_for_test_(NONE),
|
| weak_factory_(this) {
|
| @@ -139,6 +139,7 @@ void PermissionRequestManager::AddRequest(PermissionRequest* request) {
|
| content::RecordAction(
|
| base::UserMetricsAction("PermissionBubbleRequestQueued"));
|
| queued_requests_.push_back(request);
|
| + LOG(INFO) << "QUEUING REQUEST";
|
| } else {
|
| content::RecordAction(
|
| base::UserMetricsAction("PermissionBubbleIFrameRequestQueued"));
|
| @@ -244,13 +245,17 @@ void PermissionRequestManager::DisplayPendingRequests() {
|
| if (IsBubbleVisible())
|
| return;
|
|
|
| +// #if defined(OS_ANDROID)
|
| +// NOTREACHED();
|
| +// return;
|
| +// #else
|
| #if defined(OS_ANDROID)
|
| - NOTREACHED();
|
| - return;
|
| + view_ = view_factory_.Run(web_contents());
|
| #else
|
| view_ = view_factory_.Run(chrome::FindBrowserWithWebContents(web_contents()));
|
| - view_->SetDelegate(this);
|
| #endif
|
| + view_->SetDelegate(this);
|
| +// #endif
|
|
|
| TriggerShowBubble();
|
| }
|
| @@ -363,10 +368,18 @@ void PermissionRequestManager::ScheduleShowBubble() {
|
| }
|
|
|
| void PermissionRequestManager::TriggerShowBubble() {
|
| + LOG(INFO) << "TRIGGER SHOW BUBBLE";
|
| +
|
| + // TODO: set up calls when tab is created like on Desktop.
|
| + if (!view_)
|
| + view_ = view_factory_.Run(web_contents());
|
| +
|
| if (!view_)
|
| return;
|
| + LOG(INFO) << "HAS VIEW";
|
| if (IsBubbleVisible())
|
| return;
|
| + LOG(INFO) << "IS NOT VISIBLE";
|
| if (!main_frame_has_fully_loaded_)
|
| return;
|
| if (requests_.empty() && queued_requests_.empty() &&
|
|
|