WebKit merge 41660:41709 (WebKit side)....

third_party/WebKit/WebCore/page/ChromeClient.h

 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple, Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 24 matching lines @@
 class NSMenu;
 class NSResponder;
 #endif
 
 namespace WebCore {
 
     class AtomicString;
     class FileChooser;
     class FloatRect;
     class Frame;
+    class Geolocation;
     class HitTestResult;
     class IntRect;
     class Node;
     class Page;
     class String;
     class Widget;
 
     struct FrameLoadRequest;
     struct WindowFeatures;
 
@@ skipping 90 matching lines @@
         virtual String generateReplacementFile(const String& path);
         
         virtual void enableSuddenTermination();
         virtual void disableSuddenTermination();
 
         virtual bool paintCustomScrollbar(GraphicsContext*, const FloatRect&, ScrollbarControlSize, 
                                           ScrollbarControlState, ScrollbarPart pressedPart, bool vertical,
                                           float value, float proportion, ScrollbarControlPartMask);
         virtual bool paintCustomScrollCorner(GraphicsContext*, const FloatRect&);
 
-        virtual bool shouldAllowGeolocationForFrame(Frame*) { return false; }
-
+        // This is an asynchronous call. The ChromeClient can display UI asking the user for permission
+        // to use Geolococation. The ChromeClient must call Geolocation::setShouldClearCache() appropriately.
+        virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*) { }
+            
         virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>) = 0;
 
         // Notification that the given form element has changed. This function
         // will be called frequently, so handling should be very fast.
         virtual void formStateDidChange(const Node*) = 0;
 
 #if USE(ACCELERATED_COMPOSITING)
         // Pass 0 as the GraphicsLayer to detatch the root layer.
         virtual void attachRootGraphicsLayer(Frame*, GraphicsLayer*) { }
         // Sets a flag to specify that the next time content is drawn to the window,
@@ skipping 10 matching lines @@
         virtual void willPopUpMenu(NSMenu *) { }
 #endif
 
     protected:
         virtual ~ChromeClient() { }
     };
 
 }
 
 #endif // ChromeClient_h