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

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

Issue 1841653003: Drop |languages| from {Format,Elide}Url* and IDNToUnicode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix typo in elide_url.cc Created 4 years, 8 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "ios/chrome/browser/bookmarks/bookmark_model_factory.h" 5 #include "ios/chrome/browser/bookmarks/bookmark_model_factory.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/memory/singleton.h" 9 #include "base/memory/singleton.h"
10 #include "components/bookmarks/browser/bookmark_model.h" 10 #include "components/bookmarks/browser/bookmark_model.h"
11 #include "components/bookmarks/browser/bookmark_utils.h" 11 #include "components/bookmarks/browser/bookmark_utils.h"
12 #include "components/bookmarks/browser/startup_task_runner_service.h" 12 #include "components/bookmarks/browser/startup_task_runner_service.h"
13 #include "components/keyed_service/ios/browser_state_dependency_manager.h" 13 #include "components/keyed_service/ios/browser_state_dependency_manager.h"
14 #include "components/prefs/pref_service.h" 14 #include "components/prefs/pref_service.h"
15 #include "components/undo/bookmark_undo_service.h" 15 #include "components/undo/bookmark_undo_service.h"
16 #include "ios/chrome/browser/bookmarks/bookmark_client_impl.h" 16 #include "ios/chrome/browser/bookmarks/bookmark_client_impl.h"
17 #include "ios/chrome/browser/bookmarks/startup_task_runner_service_factory.h" 17 #include "ios/chrome/browser/bookmarks/startup_task_runner_service_factory.h"
18 #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h" 18 #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h"
19 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" 19 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
20 #include "ios/chrome/browser/history/history_service_factory.h" 20 #include "ios/chrome/browser/history/history_service_factory.h"
21 #include "ios/chrome/browser/pref_names.h"
22 #include "ios/chrome/browser/undo/bookmark_undo_service_factory.h" 21 #include "ios/chrome/browser/undo/bookmark_undo_service_factory.h"
23 #include "ios/web/public/web_thread.h" 22 #include "ios/web/public/web_thread.h"
24 23
25 namespace ios { 24 namespace ios {
26 25
27 // static 26 // static
28 bookmarks::BookmarkModel* BookmarkModelFactory::GetForBrowserState( 27 bookmarks::BookmarkModel* BookmarkModelFactory::GetForBrowserState(
29 ios::ChromeBrowserState* browser_state) { 28 ios::ChromeBrowserState* browser_state) {
30 return static_cast<bookmarks::BookmarkModel*>( 29 return static_cast<bookmarks::BookmarkModel*>(
31 GetInstance()->GetServiceForBrowserState(browser_state, true)); 30 GetInstance()->GetServiceForBrowserState(browser_state, true));
(...skipping 28 matching lines...) Expand all
60 59
61 scoped_ptr<KeyedService> BookmarkModelFactory::BuildServiceInstanceFor( 60 scoped_ptr<KeyedService> BookmarkModelFactory::BuildServiceInstanceFor(
62 web::BrowserState* context) const { 61 web::BrowserState* context) const {
63 ios::ChromeBrowserState* browser_state = 62 ios::ChromeBrowserState* browser_state =
64 ios::ChromeBrowserState::FromBrowserState(context); 63 ios::ChromeBrowserState::FromBrowserState(context);
65 scoped_ptr<bookmarks::BookmarkModel> bookmark_model( 64 scoped_ptr<bookmarks::BookmarkModel> bookmark_model(
66 new bookmarks::BookmarkModel( 65 new bookmarks::BookmarkModel(
67 make_scoped_ptr(new BookmarkClientImpl(browser_state)))); 66 make_scoped_ptr(new BookmarkClientImpl(browser_state))));
68 bookmark_model->Load( 67 bookmark_model->Load(
69 browser_state->GetPrefs(), 68 browser_state->GetPrefs(),
70 browser_state->GetPrefs()->GetString(prefs::kAcceptLanguages),
71 browser_state->GetStatePath(), 69 browser_state->GetStatePath(),
72 ios::StartupTaskRunnerServiceFactory::GetForBrowserState(browser_state) 70 ios::StartupTaskRunnerServiceFactory::GetForBrowserState(browser_state)
73 ->GetBookmarkTaskRunner(), 71 ->GetBookmarkTaskRunner(),
74 web::WebThread::GetTaskRunnerForThread(web::WebThread::UI)); 72 web::WebThread::GetTaskRunnerForThread(web::WebThread::UI));
75 ios::BookmarkUndoServiceFactory::GetForBrowserState(browser_state) 73 ios::BookmarkUndoServiceFactory::GetForBrowserState(browser_state)
76 ->Start(bookmark_model.get()); 74 ->Start(bookmark_model.get());
77 return std::move(bookmark_model); 75 return std::move(bookmark_model);
78 } 76 }
79 77
80 web::BrowserState* BookmarkModelFactory::GetBrowserStateToUse( 78 web::BrowserState* BookmarkModelFactory::GetBrowserStateToUse(
81 web::BrowserState* context) const { 79 web::BrowserState* context) const {
82 return GetBrowserStateRedirectedInIncognito(context); 80 return GetBrowserStateRedirectedInIncognito(context);
83 } 81 }
84 82
85 bool BookmarkModelFactory::ServiceIsNULLWhileTesting() const { 83 bool BookmarkModelFactory::ServiceIsNULLWhileTesting() const {
86 return true; 84 return true;
87 } 85 }
88 86
89 } // namespace ios 87 } // namespace ios
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698