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

Unified Diff: chrome/browser/bookmarks/bookmark_storage.cc

Issue 342068: Third patch in getting rid of caching MessageLoop pointers and always using C... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/bookmarks/bookmark_storage.cc
===================================================================
--- chrome/browser/bookmarks/bookmark_storage.cc (revision 30650)
+++ chrome/browser/bookmarks/bookmark_storage.cc (working copy)
@@ -7,12 +7,10 @@
#include "base/compiler_specific.h"
#include "base/file_util.h"
#include "base/histogram.h"
-#include "base/message_loop.h"
-#include "base/thread.h"
#include "base/time.h"
#include "chrome/browser/bookmarks/bookmark_codec.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/browser/browser_process.h"
+#include "chrome/browser/chrome_thread.h"
#include "chrome/browser/profile.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/json_value_serializer.h"
@@ -65,11 +63,9 @@
class BookmarkStorage::LoadTask : public Task {
public:
LoadTask(const FilePath& path,
- MessageLoop* loop,
BookmarkStorage* storage,
LoadDetails* details)
: path_(path),
- loop_(loop),
storage_(storage),
details_(details) {
}
@@ -103,13 +99,11 @@
}
}
- if (loop_) {
- loop_->PostTask(FROM_HERE, NewRunnableMethod(
- storage_.get(), &BookmarkStorage::OnLoadFinished,
- bookmark_file_exists, path_));
- } else {
- storage_->OnLoadFinished(bookmark_file_exists, path_);
- }
+ ChromeThread::PostTask(
+ ChromeThread::UI, FROM_HERE,
+ NewRunnableMethod(
+ storage_.get(), &BookmarkStorage::OnLoadFinished,
+ bookmark_file_exists, path_));
}
private:
@@ -125,7 +119,6 @@
}
const FilePath path_;
- MessageLoop* loop_;
scoped_refptr<BookmarkStorage> storage_;
LoadDetails* details_;
@@ -137,13 +130,12 @@
BookmarkStorage::BookmarkStorage(Profile* profile, BookmarkModel* model)
: profile_(profile),
model_(model),
- backend_thread_(g_browser_process->file_thread()),
- writer_(profile->GetPath().Append(chrome::kBookmarksFileName),
- backend_thread_),
+ writer_(profile->GetPath().Append(chrome::kBookmarksFileName)),
tmp_history_path_(
profile->GetPath().Append(chrome::kHistoryBookmarksFileName)) {
writer_.set_commit_interval(base::TimeDelta::FromMilliseconds(kSaveDelayMS));
- RunTaskOnBackendThread(new BackupTask(writer_.path()));
+ ChromeThread::PostTask(
+ ChromeThread::FILE, FROM_HERE, new BackupTask(writer_.path()));
}
BookmarkStorage::~BookmarkStorage() {
@@ -159,11 +151,8 @@
}
void BookmarkStorage::DoLoadBookmarks(const FilePath& path) {
- Task* task = new LoadTask(path,
- backend_thread() ? MessageLoop::current() : NULL,
- this,
- details_.get());
- RunTaskOnBackendThread(task);
+ ChromeThread::PostTask(
+ ChromeThread::FILE, FROM_HERE, new LoadTask(path, this, details_.get()));
}
void BookmarkStorage::MigrateFromHistory() {
@@ -238,7 +227,8 @@
SaveNow();
// Clean up after migration from history.
- RunTaskOnBackendThread(new FileDeleteTask(tmp_history_path_));
+ ChromeThread::PostTask(
+ ChromeThread::FILE, FROM_HERE, new FileDeleteTask(tmp_history_path_));
}
}
@@ -270,12 +260,3 @@
writer_.WriteNow(data);
return true;
}
-
-void BookmarkStorage::RunTaskOnBackendThread(Task* task) const {
- if (backend_thread()) {
- backend_thread()->message_loop()->PostTask(FROM_HERE, task);
- } else {
- task->Run();
- delete task;
- }
-}
« no previous file with comments | « chrome/browser/bookmarks/bookmark_storage.h ('k') | chrome/browser/bookmarks/bookmark_table_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698