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

Side by Side Diff: chrome/browser/history/android/bookmark_model_sql_handler.cc

Issue 1128173005: Clean up ProfileManager interface. Base URL: https://chromium.googlesource.com/chromium/src@issue479309
Patch Set: sync Created 5 years, 6 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/history/android/bookmark_model_sql_handler.h" 5 #include "chrome/browser/history/android/bookmark_model_sql_handler.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 8 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
9 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/profiles/profile_manager.h" 10 #include "chrome/browser/profiles/profile_manager.h"
10 #include "components/bookmarks/browser/bookmark_model.h" 11 #include "components/bookmarks/browser/bookmark_model.h"
11 #include "components/bookmarks/browser/bookmark_utils.h" 12 #include "components/bookmarks/browser/bookmark_utils.h"
12 #include "components/history/core/browser/url_database.h" 13 #include "components/history/core/browser/url_database.h"
13 #include "content/public/browser/browser_thread.h" 14 #include "content/public/browser/browser_thread.h"
14 15
15 using base::Time; 16 using base::Time;
16 using bookmarks::BookmarkModel; 17 using bookmarks::BookmarkModel;
17 using bookmarks::BookmarkNode; 18 using bookmarks::BookmarkNode;
18 using content::BrowserThread; 19 using content::BrowserThread;
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 i != nodes.end(); ++i) { 78 i != nodes.end(); ++i) {
78 bookmark_model->SetTitle(*i, title); 79 bookmark_model->SetTitle(*i, title);
79 } 80 }
80 } 81 }
81 82
82 83
83 BookmarkModelSQLHandler::Task::~Task() { 84 BookmarkModelSQLHandler::Task::~Task() {
84 } 85 }
85 86
86 BookmarkModel* BookmarkModelSQLHandler::Task::GetBookmarkModel() { 87 BookmarkModel* BookmarkModelSQLHandler::Task::GetBookmarkModel() {
87 Profile* profile = ProfileManager::GetLastUsedProfile(); 88 Profile* profile = g_browser_process->profile_manager()->GetLastUsedProfile();
88 if (!profile) 89 if (!profile)
89 return NULL; 90 return nullptr;
90 return BookmarkModelFactory::GetForProfile(profile); 91 return BookmarkModelFactory::GetForProfile(profile);
91 } 92 }
92 93
93 BookmarkModelSQLHandler::BookmarkModelSQLHandler( 94 BookmarkModelSQLHandler::BookmarkModelSQLHandler(
94 URLDatabase* url_database) 95 URLDatabase* url_database)
95 : SQLHandler(kInterestingColumns, arraysize(kInterestingColumns)), 96 : SQLHandler(kInterestingColumns, arraysize(kInterestingColumns)),
96 url_database_(url_database) { 97 url_database_(url_database) {
97 } 98 }
98 99
99 BookmarkModelSQLHandler::~BookmarkModelSQLHandler() { 100 BookmarkModelSQLHandler::~BookmarkModelSQLHandler() {
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind( 167 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(
167 &BookmarkModelSQLHandler::Task::AddBookmarkToMobileFolder, 168 &BookmarkModelSQLHandler::Task::AddBookmarkToMobileFolder,
168 scoped_refptr<BookmarkModelSQLHandler::Task>( 169 scoped_refptr<BookmarkModelSQLHandler::Task>(
169 new BookmarkModelSQLHandler::Task()), 170 new BookmarkModelSQLHandler::Task()),
170 row->url(), row->title())); 171 row->url(), row->title()));
171 } 172 }
172 return true; 173 return true;
173 } 174 }
174 175
175 } // namespace history 176 } // namespace history
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698