| 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/memory/singleton.h" | 7 #include "base/memory/singleton.h" |
| 8 #include "base/values.h" | 8 #include "base/values.h" |
| 9 #include "chrome/browser/bookmarks/bookmark_model.h" | 9 #include "chrome/browser/bookmarks/bookmark_model.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 } | 53 } |
| 54 | 54 |
| 55 bool BookmarkModelFactory::ServiceRedirectedInIncognito() const { | 55 bool BookmarkModelFactory::ServiceRedirectedInIncognito() const { |
| 56 return true; | 56 return true; |
| 57 } | 57 } |
| 58 | 58 |
| 59 bool BookmarkModelFactory::ServiceIsNULLWhileTesting() const { | 59 bool BookmarkModelFactory::ServiceIsNULLWhileTesting() const { |
| 60 return true; | 60 return true; |
| 61 } | 61 } |
| 62 | 62 |
| 63 bool BookmarkModelFactory::ServiceIsNULLOnImportProcess() const { |
| 64 return false; |
| 65 } |
| 66 |
| 63 // static | 67 // static |
| 64 BookmarkService* BookmarkService::FromBrowserContext( | 68 BookmarkService* BookmarkService::FromBrowserContext( |
| 65 content::BrowserContext* browser_context) { | 69 content::BrowserContext* browser_context) { |
| 66 return BookmarkModelFactory::GetForProfile( | 70 return BookmarkModelFactory::GetForProfile( |
| 67 Profile::FromBrowserContext(browser_context)); | 71 Profile::FromBrowserContext(browser_context)); |
| 68 } | 72 } |
| OLD | NEW |