chrome/browser/bookmarks/bookmark_model_factory.cc - Issue 284893003: Move bookmarks/core/... to bookmarks/...

Side by Side Diff: chrome/browser/bookmarks/bookmark_model_factory.cc

Issue 284893003: Move bookmarks/core/... to bookmarks/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebasing to ToT Created 6 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« chrome/browser/bookmarks/bookmark_expanded_state_tracker_unittest.cc ('K') | « chrome/browser/bookmarks/bookmark_html_writer_unittest.cc ('k') | chrome/browser/bookmarks/bookmark_model_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/omnibox/omnibox_field_trial.h"	13 #include "chrome/browser/omnibox/omnibox_field_trial.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"	18 #include "chrome/browser/undo/bookmark_undo_service.h"

19 #include "chrome/browser/undo/bookmark_undo_service_factory.h"	19 #include "chrome/browser/undo/bookmark_undo_service_factory.h"

20 #include "chrome/common/chrome_switches.h"	20 #include "chrome/common/chrome_switches.h"

21 #include "chrome/common/pref_names.h"	21 #include "chrome/common/pref_names.h"

22 #include "components/bookmarks/core/browser/bookmark_model.h"	22 #include "components/bookmarks/browser/bookmark_model.h"

23 #include "components/bookmarks/core/common/bookmark_pref_names.h"	23 #include "components/bookmarks/common/bookmark_pref_names.h"

24 #include "components/keyed_service/content/browser_context_dependency_manager.h"	24 #include "components/keyed_service/content/browser_context_dependency_manager.h"

25 #include "components/user_prefs/pref_registry_syncable.h"	25 #include "components/user_prefs/pref_registry_syncable.h"

26 #include "content/public/browser/browser_thread.h"	26 #include "content/public/browser/browser_thread.h"

27	27

28 // static	28 // static

29 BookmarkModel* BookmarkModelFactory::GetForProfile(Profile* profile) {	29 BookmarkModel* BookmarkModelFactory::GetForProfile(Profile* profile) {

30 ChromeBookmarkClient* bookmark_client = static_cast<ChromeBookmarkClient*>(	30 ChromeBookmarkClient* bookmark_client = static_cast<ChromeBookmarkClient*>(

31 GetInstance()->GetServiceForBrowserContext(profile, true));	31 GetInstance()->GetServiceForBrowserContext(profile, true));

32 return bookmark_client ? bookmark_client->model() : NULL;	32 return bookmark_client ? bookmark_client->model() : NULL;

33 }	33 }

(...skipping 57 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
91 }	91 }

92	92

93 content::BrowserContext* BookmarkModelFactory::GetBrowserContextToUse(	93 content::BrowserContext* BookmarkModelFactory::GetBrowserContextToUse(

94 content::BrowserContext* context) const {	94 content::BrowserContext* context) const {

95 return chrome::GetBrowserContextRedirectedInIncognito(context);	95 return chrome::GetBrowserContextRedirectedInIncognito(context);

96 }	96 }

97	97

98 bool BookmarkModelFactory::ServiceIsNULLWhileTesting() const {	98 bool BookmarkModelFactory::ServiceIsNULLWhileTesting() const {

99 return true;	99 return true;

100 }	100 }

OLD	NEW