[WebsiteSettings] Enable permission bubbles by default.

chrome/browser/chrome_quota_permission_context.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chrome_quota_permission_context.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
@@ skipping 263 matching lines @@
       tab_util::GetWebContentsByID(render_process_id,
                                    params.render_view_id);
   if (!web_contents) {
     // The tab may have gone away or the request may not be from a tab.
     LOG(WARNING) << "Attempt to request quota tabless renderer: "
                  << render_process_id << "," << params.render_view_id;
     DispatchCallbackOnIOThread(callback, QUOTA_PERMISSION_RESPONSE_CANCELLED);
     return;
   }
 
+  // TODO(gbillock): adapt this to be a better indicator of background page tab.
+  InfoBarService* infobar_service =
+      InfoBarService::FromWebContents(web_contents);
+  if (!infobar_service) {
+    // The tab has no infobar service.
+    LOG(WARNING) << "Attempt to request quota from a background page: "
+                 << render_process_id << "," << params.render_view_id;
+    DispatchCallbackOnIOThread(callback, QUOTA_PERMISSION_RESPONSE_CANCELLED);
+    return;
+  }
+
   if (PermissionBubbleManager::Enabled()) {
     PermissionBubbleManager* bubble_manager =
         PermissionBubbleManager::FromWebContents(web_contents);
     if (bubble_manager) {
       bubble_manager->AddRequest(new QuotaPermissionRequest(this,
               params.origin_url, params.requested_size, params.user_gesture,
               Profile::FromBrowserContext(web_contents->GetBrowserContext())->
                   GetPrefs()->GetString(prefs::kAcceptLanguages),
               callback));
     }
     return;
   }
 
-  InfoBarService* infobar_service =
-      InfoBarService::FromWebContents(web_contents);
-  if (!infobar_service) {
-    // The tab has no infobar service.
-    LOG(WARNING) << "Attempt to request quota from a background page: "
-                 << render_process_id << "," << params.render_view_id;
-    DispatchCallbackOnIOThread(callback, QUOTA_PERMISSION_RESPONSE_CANCELLED);
-    return;
-  }
   RequestQuotaInfoBarDelegate::Create(
       infobar_service, this, params.origin_url, params.requested_size,
       Profile::FromBrowserContext(web_contents->GetBrowserContext())->
           GetPrefs()->GetString(prefs::kAcceptLanguages),
       callback);
 }
 
 void ChromeQuotaPermissionContext::DispatchCallbackOnIOThread(
     const PermissionCallback& callback,
     QuotaPermissionResponse response) {
   DCHECK_EQ(false, callback.is_null());
 
   if (!content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)) {
     content::BrowserThread::PostTask(
         content::BrowserThread::IO, FROM_HERE,
         base::Bind(&ChromeQuotaPermissionContext::DispatchCallbackOnIOThread,
                    this, callback, response));
     return;
   }
 
   callback.Run(response);
 }
 
 ChromeQuotaPermissionContext::~ChromeQuotaPermissionContext() {}