Fix Android strict-mode violation in GeoLocation info bar.

chrome/browser/geolocation/geolocation_infobar_delegate.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/geolocation/geolocation_infobar_delegate.h"
 
 #include "chrome/browser/content_settings/permission_queue_controller.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "content/public/browser/navigation_details.h"
@@ skipping 15 matching lines @@
 
 // static
 InfoBarDelegate* GeolocationInfoBarDelegate::Create(
     InfoBarService* infobar_service,
     PermissionQueueController* controller,
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     const std::string& display_languages) {
   const content::NavigationEntry* committed_entry =
       infobar_service->web_contents()->GetController().GetLastCommittedEntry();
-  return infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
+  DelegateType * const delegate =

[Miguel Garcia, 2013/08/21 11:46:46]

nit: DelegateType* (no space)

[acleung1, 2013/08/23 23:13:09]

Done.

       new DelegateType(infobar_service, controller, id, requesting_frame,

[Miguel Garcia, 2013/08/21 11:46:46]

I thin you can push the Initialize/Show thing to the android delegate only and
extend the ifdef that already exist so the right code is applied per platform,
this is similar to what we do in the auto login infobar delegate
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/ui/...

That way you avoid the virtual method and polluting the platform agnostic
delegate with extra methods that do nothing.


In any case it seems that these two new methods could be protected right?

[acleung1, 2013/08/23 23:13:09]

It difficult to have a sort of polymorphic behavior that the subclass of
GeolocationInfoBarDelegate can override because users of that class just call
the constructor and nothing else.

I limited the added method to a single one as suggested. I also made Show()
protected as well.

                        committed_entry ? committed_entry->GetUniqueID() : 0,
-                       display_languages)));
+                       display_languages);
+  delegate->Initialize(infobar_service);
+  return delegate;
+}
+
+void GeolocationInfoBarDelegate::Initialize(InfoBarService* infobar_service) {
+  this->Show(infobar_service);
+}
+
+void GeolocationInfoBarDelegate::Show(InfoBarService* infobar_service) {
+  infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(this));
 }
 
 GeolocationInfoBarDelegate::GeolocationInfoBarDelegate(
     InfoBarService* infobar_service,
     PermissionQueueController* controller,
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     int contents_unique_id,
     const std::string& display_languages)
     : ConfirmInfoBarDelegate(infobar_service),
@@ skipping 67 matching lines @@
       "https://www.google.com/support/chrome/bin/answer.py?answer=142065";
 #endif
 
   web_contents()->OpenURL(content::OpenURLParams(
       google_util::AppendGoogleLocaleParam(GURL(kGeolocationLearnMoreUrl)),
       content::Referrer(),
       (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
       content::PAGE_TRANSITION_LINK, false));
   return false;  // Do not dismiss the info bar.
 }