projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
chrome
/
browser
/
sync
/
glue
/
history_model_worker.cc
diff --git
a/src/chrome/browser/sync/glue/history_model_worker.cc
b/src/chrome/browser/sync/glue/history_model_worker.cc
index
fec3f1e
..
d9f8754
100644
(file)
--- a/
src/chrome/browser/sync/glue/history_model_worker.cc
+++ b/
src/chrome/browser/sync/glue/history_model_worker.cc
@@
-22,8
+22,8
@@
class WorkerTask : public history::HistoryDBTask {
syncer::SyncerError* error)
: work_(work), done_(done), error_(error) {}
syncer::SyncerError* error)
: work_(work), done_(done), error_(error) {}
-
virtual
bool RunOnDBThread(history::HistoryBackend* backend,
-
history::HistoryDatabase* db) OVERRIDE
{
+ bool RunOnDBThread(history::HistoryBackend* backend,
+
history::HistoryDatabase* db) override
{
*error_ = work_.Run();
done_->Signal();
return true;
*error_ = work_.Run();
done_->Signal();
return true;
@@
-31,10
+31,10
@@
class WorkerTask : public history::HistoryDBTask {
// Since the DoWorkAndWaitUntilDone() is synchronous, we don't need to run
// any code asynchronously on the main thread after completion.
// Since the DoWorkAndWaitUntilDone() is synchronous, we don't need to run
// any code asynchronously on the main thread after completion.
- v
irtual void DoneRunOnMainThread() OVERRIDE
{}
+ v
oid DoneRunOnMainThread() override
{}
protected:
protected:
-
virtual ~WorkerTask()
{}
+
~WorkerTask() override
{}
syncer::WorkCallback work_;
WaitableEvent* done_;
syncer::WorkCallback work_;
WaitableEvent* done_;
@@
-46,16
+46,16
@@
class AddDBThreadObserverTask : public history::HistoryDBTask {
explicit AddDBThreadObserverTask(base::Closure register_callback)
: register_callback_(register_callback) {}
explicit AddDBThreadObserverTask(base::Closure register_callback)
: register_callback_(register_callback) {}
-
virtual
bool RunOnDBThread(history::HistoryBackend* backend,
-
history::HistoryDatabase* db) OVERRIDE
{
+ bool RunOnDBThread(history::HistoryBackend* backend,
+
history::HistoryDatabase* db) override
{
register_callback_.Run();
return true;
}
register_callback_.Run();
return true;
}
- v
irtual void DoneRunOnMainThread() OVERRIDE
{}
+ v
oid DoneRunOnMainThread() override
{}
private:
private:
-
virtual ~AddDBThreadObserverTask()
{}
+
~AddDBThreadObserverTask() override
{}
base::Closure register_callback_;
};
base::Closure register_callback_;
};