Move ShellWindowGeometryCache into apps

apps/shell_window_geometry_cache.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_SHELL_WINDOW_GEOMETRY_CACHE_H_
 #define CHROME_BROWSER_EXTENSIONS_SHELL_WINDOW_GEOMETRY_CACHE_H_
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
-#include "base/memory/weak_ptr.h"
+#include "base/memory/singleton.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "base/values.h"
+#include "chrome/browser/profiles/profile_keyed_service.h"
+#include "chrome/browser/profiles/profile_keyed_service_factory.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/rect.h"
 
 class Profile;
 
 namespace extensions {
+class ExtensionPrefs;
+}
 
-class ExtensionPrefs;
+namespace apps {
 
 // A cache for persisted geometry of shell windows, both to not have to wait
 // for IO when creating a new window, and to not cause IO on every window
 // geometry change.
 class ShellWindowGeometryCache
-    : public base::SupportsWeakPtr<ShellWindowGeometryCache>,
+    : public ProfileKeyedService,
       public content::NotificationObserver {
  public:
+  class Factory : public ProfileKeyedServiceFactory {
+   public:
+    static ShellWindowGeometryCache* GetForContext(
+        content::BrowserContext* context,
+        bool create);
+
+    static Factory* GetInstance();
+   private:
+    friend struct DefaultSingletonTraits<Factory>;
+
+    Factory();
+    virtual ~Factory();
+
+    // ProfileKeyedServiceFactory
+    virtual ProfileKeyedService* BuildServiceInstanceFor(
+        content::BrowserContext* context) const OVERRIDE;
+    virtual bool ServiceIsNULLWhileTesting() const OVERRIDE;
+    virtual content::BrowserContext* GetBrowserContextToUse(
+        content::BrowserContext* context) const OVERRIDE;
+  };
+
   ShellWindowGeometryCache(Profile* profile,
-                           ExtensionPrefs* prefs);
+                           extensions::ExtensionPrefs* prefs);
 
   virtual ~ShellWindowGeometryCache();
 
+  // Returns the instance for the given browsing context.
+  static ShellWindowGeometryCache* Get(content::BrowserContext* context);
+
   // Save the geometry and state associated with |extension_id| and |window_id|.
   void SaveGeometry(const std::string& extension_id,
                     const std::string& window_id,
                     const gfx::Rect& bounds,
                     ui::WindowShowState state);
 
   // Get any saved geometry and state associated with |extension_id| and
   // |window_id|. If saved data exists, sets |bounds| and |state| if not NULL
   // and returns true.
   bool GetGeometry(const std::string& extension_id,
                    const std::string& window_id,
                    gfx::Rect* bounds,
                    ui::WindowShowState* state) const;
 
+  // ProfileKeyedService
+  virtual void Shutdown() OVERRIDE;
+
   // Maximum number of windows we'll cache the geometry for per app.
   static const size_t kMaxCachedWindows = 100;
 
  protected:
   friend class ShellWindowGeometryCacheTest;
 
   // For tests, this modifies the timeout delay for saving changes from calls
   // to SaveGeometry. (Note that even if this is set to 0, you still need to
   // run the message loop to see the results of any SyncToStorage call).
   void SetSyncDelayForTests(int timeout_ms);
@@ skipping 13 matching lines @@
   // content::NotificationObserver
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   void OnExtensionLoaded(const std::string& extension_id);
   void OnExtensionUnloaded(const std::string& extension_id);
   void SyncToStorage();
 
   // Preferences storage.
-  ExtensionPrefs* prefs_;
+  extensions::ExtensionPrefs* prefs_;
 
   // Cached data
   std::map<std::string, ExtensionData> cache_;
 
   // Data that still needs saving
   std::set<std::string> unsynced_extensions_;
 
   // The timer used to save the data
   base::OneShotTimer<ShellWindowGeometryCache> sync_timer_;
 
   // The timeout value we'll use for |sync_timer_|.
   base::TimeDelta sync_delay_;
 
   content::NotificationRegistrar registrar_;
 };
 
-}  // namespace extensions
+}  // namespace apps
 
 #endif  // CHROME_BROWSER_EXTENSIONS_SHELL_WINDOW_GEOMETRY_CACHE_H_