Rename apps::ShellWindow to apps::AppWindow

apps/shell_window_geometry_cache.h

Index: apps/shell_window_geometry_cache.h
diff --git a/apps/shell_window_geometry_cache.h b/apps/shell_window_geometry_cache.h
deleted file mode 100644
index 6af188605ce26e8e2754884cf22813cb60ce6cde..0000000000000000000000000000000000000000
--- a/apps/shell_window_geometry_cache.h
+++ /dev/null
@@ -1,156 +0,0 @@
-// 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/singleton.h"
-#include "base/observer_list.h"
-#include "base/time/time.h"
-#include "base/timer/timer.h"
-#include "base/values.h"
-#include "components/browser_context_keyed_service/browser_context_keyed_service.h"
-#include "components/browser_context_keyed_service/browser_context_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;
-}
-
-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 BrowserContextKeyedService,
-      public content::NotificationObserver {
- public:
-  class Factory : public BrowserContextKeyedServiceFactory {
-   public:
-    static ShellWindowGeometryCache* GetForContext(
-        content::BrowserContext* context,
-        bool create);
-
-    static Factory* GetInstance();
-   private:
-    friend struct DefaultSingletonTraits<Factory>;
-
-    Factory();
-    virtual ~Factory();
-
-    // BrowserContextKeyedServiceFactory
-    virtual BrowserContextKeyedService* BuildServiceInstanceFor(
-        content::BrowserContext* context) const OVERRIDE;
-    virtual bool ServiceIsNULLWhileTesting() const OVERRIDE;
-    virtual content::BrowserContext* GetBrowserContextToUse(
-        content::BrowserContext* context) const OVERRIDE;
-  };
-
-  class Observer {
-   public:
-    virtual void OnGeometryCacheChanged(const std::string& extension_id,
-                                        const std::string& window_id,
-                                        const gfx::Rect& bounds) = 0;
-
-   protected:
-    virtual ~Observer() {};
-  };
-
-  ShellWindowGeometryCache(Profile* profile,
-                           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,
-                    const gfx::Rect& screen_bounds,
-                    ui::WindowShowState state);
-
-  // Get any saved geometry and state associated with |extension_id| and
-  // |window_id|. If saved data exists, sets |bounds|, |screen_bounds| and
-  // |state| if not NULL and returns true.
-  bool GetGeometry(const std::string& extension_id,
-                   const std::string& window_id,
-                   gfx::Rect* bounds,
-                   gfx::Rect* screen_bounds,
-                   ui::WindowShowState* state);
-
-  // BrowserContextKeyedService
-  virtual void Shutdown() OVERRIDE;
-
-  void AddObserver(Observer* observer);
-  void RemoveObserver(Observer* observer);
-
-  // 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);
-
- private:
-  // Data stored for each window.
-  struct WindowData {
-    WindowData();
-    ~WindowData();
-    gfx::Rect bounds;
-    gfx::Rect screen_bounds;
-    ui::WindowShowState window_state;
-    base::Time last_change;
-  };
-
-  // Data stored for each extension.
-  typedef std::map<std::string, WindowData> ExtensionData;
-
-  // content::NotificationObserver
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
-
-  void LoadGeometryFromStorage(const std::string& extension_id);
-  void OnExtensionUnloaded(const std::string& extension_id);
-  void SyncToStorage();
-
-  // Preferences storage.
-  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_;
-  ObserverList<Observer> observers_;
-};
-
-}  // namespace apps
-
-#endif  // CHROME_BROWSER_EXTENSIONS_SHELL_WINDOW_GEOMETRY_CACHE_H_