Geolocation request for Google Now

chrome/browser/ui/google_now/google_now_service.h

Index: chrome/browser/ui/google_now/google_now_service.h
diff --git a/chrome/browser/ui/google_now/google_now_service.h b/chrome/browser/ui/google_now/google_now_service.h
index eb6459a237b7f5270292c57c1c5778184776bb53..2fca48247cd9b92d405a3d38f943bd26081c561d 100644
--- a/chrome/browser/ui/google_now/google_now_service.h
+++ b/chrome/browser/ui/google_now/google_now_service.h
@@ -52,8 +52,10 @@ class GoogleNowService : public ProfileKeyedService {
   // Starts obtaining location of the machine.
   void StartObtainingGeolocation();
   void OnLocationObtained(const content::Geoposition& position);
+  void OnLocationRequestTimeout();
 
-  // Starts downloading cards from the server.
+  // Starts downloading cards from the server. If the position's Validate() call

[bulach, 2012/12/10 14:25:46]

nit: not sure if the last bit add much in here :) I mean, for any
content::Geoposition object, Validate() being false means it's not available...

[vadimt, 2012/12/10 19:09:08]

Done.

+  // returns false, this means that the position is not available.
   void StartServerRequest(const content::Geoposition& position);
   void OnServerRequestCompleted(net::URLRequest* request, int num_bytes);
 
@@ -69,6 +71,11 @@ class GoogleNowService : public ProfileKeyedService {
   Profile* const profile_;
   // Timer to schedule next cards update.
   base::OneShotTimer<GoogleNowService> next_update_timer_;
+  // Timer to cancel geolocation requests that take too long.
+  base::OneShotTimer<GoogleNowService> geolocation_request_timer_;
+  // Weak factory for the geolocation request callback. Used to ensure
+  // geolocation request callback is not run after this object is destroyed.
+  base::WeakPtrFactory<GoogleNowService> geolocation_request_weak_factory_;

[John Knottenbelt, 2012/12/10 14:30:58]

nit: I read this as "a factory that hands out weak pointers to geolocation
requests". It might be clearer to name it just weak_factory_.

[vadimt, 2012/12/10 19:09:08]

Probably, we'll have other weak pointers here, for other kinds of asynchronous
requests. So, if you don't mind, I'll leave it as is. Thanks for the comment!

 
   DISALLOW_COPY_AND_ASSIGN(GoogleNowService);
 };