Converting BookmarkModel and HistoryService to ProfileKeyedServices. This just performs the initial…

chrome/browser/bookmarks/bookmark_model_factory.h

Index: chrome/browser/bookmarks/bookmark_model_factory.h
===================================================================
--- chrome/browser/bookmarks/bookmark_model_factory.h	(revision 0)
+++ chrome/browser/bookmarks/bookmark_model_factory.h	(revision 0)
@@ -0,0 +1,39 @@
+// Copyright (c) 2011 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_BOOKMARKS_BOOKMARK_MODEL_FACTORY_H_
+#define CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_FACTORY_H_
+#pragma once
+
+#include "base/memory/singleton.h"
+#include "chrome/browser/profiles/profile_keyed_service_factory.h"
+
+class Profile;
+class BookmarkModel;
+
+// Singleton that owns all BookmarkModel and associates them with
+// Profiles.
+class BookmarkModelFactory : public ProfileKeyedServiceFactory {
+ public:
+  static BookmarkModel* GetForProfile(Profile* profile);
+
+  static BookmarkModel* GetForProfileIfExists(Profile* profile);
+
+  static BookmarkModelFactory* GetInstance();
+
+ private:
+  friend struct DefaultSingletonTraits<BookmarkModelFactory>;
+
+  BookmarkModelFactory();
+  virtual ~BookmarkModelFactory();
+
+  // ProfileKeyedServiceFactory:
+  virtual ProfileKeyedService* BuildServiceInstanceFor(
+      Profile* profile) const OVERRIDE;
+  virtual void RegisterUserPrefs(PrefService* user_prefs) OVERRIDE;
+  virtual bool ServiceRedirectedInIncognito() OVERRIDE;
+  virtual bool ServiceIsNULLWhileTesting() OVERRIDE;
+};
+
+#endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_FACTORY_H_
Property changes on: chrome\browser\bookmarks\bookmark_model_factory.h
___________________________________________________________________
Added: svn:eol-style
   + LF