Move infobar handling to a tab helper.

chrome/browser/geolocation/chrome_geolocation_permission_context.cc

 // Copyright (c) 2011 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/geolocation/chrome_geolocation_permission_context.h"
 
 #include <functional>
 #include <string>
 #include <vector>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/google/google_util.h"
+#include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/geolocation/geolocation_provider.h"
 #include "content/browser/renderer_host/render_view_host.h"
@@ skipping 410 matching lines @@
     } else {
       ++i;
     }
   }
 }
 
 void GeolocationInfoBarQueueController::ShowQueuedInfoBar(int render_process_id,
                                                           int render_view_id) {
   TabContents* tab_contents =
       tab_util::GetTabContentsByID(render_process_id, render_view_id);
   TabContentsWrapper* wrapper = NULL;

[Peter Kasting, 2011/08/31 18:47:32]

Nit: Convert this TCW* temp into an InfoBarTabHelper*

[Avi (use Gerrit), 2011/08/31 21:18:54]

Why? It's used once.

[Peter Kasting, 2011/08/31 21:24:55]

nm, I misread the code.

   if (tab_contents)
     wrapper = TabContentsWrapper::GetCurrentWrapperForContents(tab_contents);
   for (PendingInfoBarRequests::iterator i = pending_infobar_requests_.begin();
        i != pending_infobar_requests_.end(); ) {
     if (i->IsForTab(render_process_id, render_view_id)) {
       if (!wrapper) {
         i = pending_infobar_requests_.erase(i);
         continue;
       }
 
       if (!i->infobar_delegate) {
         if (!registrar_.IsRegistered(
                 this, content::NOTIFICATION_TAB_CONTENTS_DESTROYED,
                 Source<TabContents>(tab_contents))) {
           registrar_.Add(this, content::NOTIFICATION_TAB_CONTENTS_DESTROYED,
                          Source<TabContents>(tab_contents));
         }
         i->infobar_delegate = new GeolocationConfirmInfoBarDelegate(
             tab_contents, this, render_process_id, render_view_id, i->bridge_id,
             i->requesting_frame,
             profile_->GetPrefs()->GetString(prefs::kAcceptLanguages));
-        wrapper->AddInfoBar(i->infobar_delegate);
+        wrapper->infobar_tab_helper()->AddInfoBar(i->infobar_delegate);
       }
       break;
     }
     ++i;
   }
 }
 
 GeolocationInfoBarQueueController::PendingInfoBarRequests::iterator
     GeolocationInfoBarQueueController::CancelInfoBarRequestInternal(
     PendingInfoBarRequests::iterator i) {
   InfoBarDelegate* delegate = i->infobar_delegate;
   if (!delegate)
     return pending_infobar_requests_.erase(i);
 
   TabContents* tab_contents =
       tab_util::GetTabContentsByID(i->render_process_id, i->render_view_id);
   if (!tab_contents)
     return pending_infobar_requests_.erase(i);
 
   // TabContents will destroy the InfoBar, which will remove from our vector
   // asynchronously.
   TabContentsWrapper* wrapper =

[Peter Kasting, 2011/08/31 18:47:32]

Nit: Just combine these two lines

       TabContentsWrapper::GetCurrentWrapperForContents(tab_contents);
-  wrapper->RemoveInfoBar(i->infobar_delegate);
+  wrapper->infobar_tab_helper()->RemoveInfoBar(i->infobar_delegate);
   return ++i;
 }
 
 
 // GeolocationPermissionContext -----------------------------------------------
 
 ChromeGeolocationPermissionContext::ChromeGeolocationPermissionContext(
     Profile* profile)
     : profile_(profile),
       ALLOW_THIS_IN_INITIALIZER_LIST(geolocation_infobar_queue_controller_(
@@ skipping 125 matching lines @@
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, NewRunnableMethod(
         this, &ChromeGeolocationPermissionContext::CancelPendingInfoBarRequest,
         render_process_id, render_view_id, bridge_id));
      return;
   }
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   geolocation_infobar_queue_controller_->CancelInfoBarRequest(render_process_id,
       render_view_id, bridge_id);
 }