| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 5 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 
| 6 | 6 | 
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" | 
| 8 #include "base/deferred_sequenced_task_runner.h" | 8 #include "base/deferred_sequenced_task_runner.h" | 
| 9 #include "base/memory/singleton.h" | 9 #include "base/memory/singleton.h" | 
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" | 
| 11 #include "base/values.h" | 11 #include "base/values.h" | 
| 12 #include "chrome/browser/bookmarks/chrome_bookmark_client.h" | 12 #include "chrome/browser/bookmarks/chrome_bookmark_client.h" | 
| 13 #include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h" | 13 #include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h" | 
| 14 #include "chrome/browser/profiles/incognito_helpers.h" | 14 #include "chrome/browser/profiles/incognito_helpers.h" | 
| 15 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" | 
| 16 #include "chrome/browser/profiles/startup_task_runner_service.h" | 16 #include "chrome/browser/profiles/startup_task_runner_service.h" | 
| 17 #include "chrome/browser/profiles/startup_task_runner_service_factory.h" | 17 #include "chrome/browser/profiles/startup_task_runner_service_factory.h" | 
| 18 #include "chrome/browser/undo/bookmark_undo_service.h" |  | 
| 19 #include "chrome/browser/undo/bookmark_undo_service_factory.h" | 18 #include "chrome/browser/undo/bookmark_undo_service_factory.h" | 
| 20 #include "chrome/common/chrome_switches.h" | 19 #include "chrome/common/chrome_switches.h" | 
| 21 #include "chrome/common/pref_names.h" | 20 #include "chrome/common/pref_names.h" | 
| 22 #include "components/bookmarks/browser/bookmark_model.h" | 21 #include "components/bookmarks/browser/bookmark_model.h" | 
| 23 #include "components/bookmarks/common/bookmark_pref_names.h" | 22 #include "components/bookmarks/common/bookmark_pref_names.h" | 
| 24 #include "components/keyed_service/content/browser_context_dependency_manager.h" | 23 #include "components/keyed_service/content/browser_context_dependency_manager.h" | 
| 25 #include "components/pref_registry/pref_registry_syncable.h" | 24 #include "components/pref_registry/pref_registry_syncable.h" | 
|  | 25 #include "components/undo/bookmark_undo_service.h" | 
| 26 #include "content/public/browser/browser_thread.h" | 26 #include "content/public/browser/browser_thread.h" | 
| 27 | 27 | 
| 28 using bookmarks::BookmarkModel; | 28 using bookmarks::BookmarkModel; | 
| 29 | 29 | 
| 30 // static | 30 // static | 
| 31 BookmarkModel* BookmarkModelFactory::GetForProfile(Profile* profile) { | 31 BookmarkModel* BookmarkModelFactory::GetForProfile(Profile* profile) { | 
| 32   return static_cast<BookmarkModel*>( | 32   return static_cast<BookmarkModel*>( | 
| 33       GetInstance()->GetServiceForBrowserContext(profile, true)); | 33       GetInstance()->GetServiceForBrowserContext(profile, true)); | 
| 34 } | 34 } | 
| 35 | 35 | 
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 99 } | 99 } | 
| 100 | 100 | 
| 101 content::BrowserContext* BookmarkModelFactory::GetBrowserContextToUse( | 101 content::BrowserContext* BookmarkModelFactory::GetBrowserContextToUse( | 
| 102     content::BrowserContext* context) const { | 102     content::BrowserContext* context) const { | 
| 103   return chrome::GetBrowserContextRedirectedInIncognito(context); | 103   return chrome::GetBrowserContextRedirectedInIncognito(context); | 
| 104 } | 104 } | 
| 105 | 105 | 
| 106 bool BookmarkModelFactory::ServiceIsNULLWhileTesting() const { | 106 bool BookmarkModelFactory::ServiceIsNULLWhileTesting() const { | 
| 107   return true; | 107   return true; | 
| 108 } | 108 } | 
| OLD | NEW | 
|---|