Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(253)

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
OLDNEW
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"
11 #include "base/values.h" 10 #include "base/values.h"
12 #include "build/build_config.h" 11 #include "build/build_config.h"
13 #include "chrome/browser/bookmarks/chrome_bookmark_client.h" 12 #include "chrome/browser/bookmarks/chrome_bookmark_client.h"
14 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h" 13 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
15 #include "chrome/browser/bookmarks/startup_task_runner_service_factory.h" 14 #include "chrome/browser/bookmarks/startup_task_runner_service_factory.h"
16 #include "chrome/browser/profiles/incognito_helpers.h" 15 #include "chrome/browser/profiles/incognito_helpers.h"
17 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/undo/bookmark_undo_service_factory.h" 17 #include "chrome/browser/undo/bookmark_undo_service_factory.h"
19 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
20 #include "chrome/common/features.h" 19 #include "chrome/common/features.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/browser/bookmark_utils.h" 22 #include "components/bookmarks/browser/bookmark_utils.h"
24 #include "components/bookmarks/browser/startup_task_runner_service.h" 23 #include "components/bookmarks/browser/startup_task_runner_service.h"
25 #include "components/keyed_service/content/browser_context_dependency_manager.h" 24 #include "components/keyed_service/content/browser_context_dependency_manager.h"
25 #include "components/prefs/pref_service.h"
26 #include "components/undo/bookmark_undo_service.h" 26 #include "components/undo/bookmark_undo_service.h"
27 #include "content/public/browser/browser_thread.h" 27 #include "content/public/browser/browser_thread.h"
28 28
29 #if BUILDFLAG(ANDROID_JAVA_UI) 29 #if BUILDFLAG(ANDROID_JAVA_UI)
30 #include "chrome/browser/android/offline_pages/offline_page_model_factory.h" 30 #include "chrome/browser/android/offline_pages/offline_page_model_factory.h"
31 #include "components/offline_pages/offline_page_feature.h" 31 #include "components/offline_pages/offline_page_feature.h"
32 #include "components/offline_pages/offline_page_model.h" 32 #include "components/offline_pages/offline_page_model.h"
33 #endif // BUILDFLAG(ANDROID_JAVA_UI) 33 #endif // BUILDFLAG(ANDROID_JAVA_UI)
34 34
35 using bookmarks::BookmarkModel; 35 using bookmarks::BookmarkModel;
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 } 105 }
106 106
107 content::BrowserContext* BookmarkModelFactory::GetBrowserContextToUse( 107 content::BrowserContext* BookmarkModelFactory::GetBrowserContextToUse(
108 content::BrowserContext* context) const { 108 content::BrowserContext* context) const {
109 return chrome::GetBrowserContextRedirectedInIncognito(context); 109 return chrome::GetBrowserContextRedirectedInIncognito(context);
110 } 110 }
111 111
112 bool BookmarkModelFactory::ServiceIsNULLWhileTesting() const { 112 bool BookmarkModelFactory::ServiceIsNULLWhileTesting() const {
113 return true; 113 return true;
114 } 114 }
OLDNEW
« no previous file with comments | « chrome/browser/background/background_mode_manager_mac.mm ('k') | chrome/browser/browser_encoding_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698