Index: chrome/browser/extensions/api/history/history_api.cc |
diff --git a/chrome/browser/extensions/api/history/history_api.cc b/chrome/browser/extensions/api/history/history_api.cc |
index 00af52c4950d3633009cb747bd60680f005f294f..06b5fcc4fc968291549084171d99ada8f3c6c36a 100644 |
--- a/chrome/browser/extensions/api/history/history_api.cc |
+++ b/chrome/browser/extensions/api/history/history_api.cc |
@@ -268,7 +268,7 @@ void HistoryFunctionWithCallback::SendResponseToCallback() { |
Release(); // Balanced in RunImpl(). |
} |
-bool GetMostVisitedHistoryFunction::RunAsyncImpl() { |
+bool HistoryGetMostVisitedFunction::RunAsyncImpl() { |
scoped_ptr<GetMostVisited::Params> params = |
GetMostVisited::Params::Create(*args_); |
EXTENSION_FUNCTION_VALIDATE(params.get()); |
@@ -288,12 +288,12 @@ bool GetMostVisitedHistoryFunction::RunAsyncImpl() { |
HistoryService* hs = |
HistoryServiceFactory::GetForProfile(profile(), Profile::EXPLICIT_ACCESS); |
hs->QueryFilteredURLs(max_results, filter, false, &cancelable_consumer_, |
- base::Bind(&GetMostVisitedHistoryFunction::QueryComplete, |
+ base::Bind(&HistoryGetMostVisitedFunction::QueryComplete, |
base::Unretained(this))); |
return true; |
} |
-void GetMostVisitedHistoryFunction::QueryComplete( |
+void HistoryGetMostVisitedFunction::QueryComplete( |
CancelableRequestProvider::Handle handle, |
const history::FilteredURLList& data) { |
std::vector<linked_ptr<MostVisitedItem> > results; |
@@ -308,7 +308,7 @@ void GetMostVisitedHistoryFunction::QueryComplete( |
SendAsyncResponse(); |
} |
-bool GetVisitsHistoryFunction::RunAsyncImpl() { |
+bool HistoryGetVisitsFunction::RunAsyncImpl() { |
scoped_ptr<GetVisits::Params> params(GetVisits::Params::Create(*args_)); |
EXTENSION_FUNCTION_VALIDATE(params.get()); |
@@ -322,13 +322,13 @@ bool GetVisitsHistoryFunction::RunAsyncImpl() { |
hs->QueryURL(url, |
true, // Retrieve full history of a URL. |
&cancelable_consumer_, |
- base::Bind(&GetVisitsHistoryFunction::QueryComplete, |
+ base::Bind(&HistoryGetVisitsFunction::QueryComplete, |
base::Unretained(this))); |
return true; |
} |
-void GetVisitsHistoryFunction::QueryComplete( |
+void HistoryGetVisitsFunction::QueryComplete( |
HistoryService::Handle request_service, |
bool success, |
const history::URLRow* url_row, |
@@ -347,7 +347,7 @@ void GetVisitsHistoryFunction::QueryComplete( |
SendAsyncResponse(); |
} |
-bool SearchHistoryFunction::RunAsyncImpl() { |
+bool HistorySearchFunction::RunAsyncImpl() { |
scoped_ptr<Search::Params> params(Search::Params::Create(*args_)); |
EXTENSION_FUNCTION_VALIDATE(params.get()); |
@@ -368,13 +368,13 @@ bool SearchHistoryFunction::RunAsyncImpl() { |
HistoryServiceFactory::GetForProfile(profile(), |
Profile::EXPLICIT_ACCESS); |
hs->QueryHistory(search_text, options, &cancelable_consumer_, |
- base::Bind(&SearchHistoryFunction::SearchComplete, |
+ base::Bind(&HistorySearchFunction::SearchComplete, |
base::Unretained(this))); |
return true; |
} |
-void SearchHistoryFunction::SearchComplete( |
+void HistorySearchFunction::SearchComplete( |
HistoryService::Handle request_handle, |
history::QueryResults* results) { |
HistoryItemList history_item_vec; |
@@ -391,7 +391,7 @@ void SearchHistoryFunction::SearchComplete( |
SendAsyncResponse(); |
} |
-bool AddUrlHistoryFunction::RunImpl() { |
+bool HistoryAddUrlFunction::RunImpl() { |
scoped_ptr<AddUrl::Params> params(AddUrl::Params::Create(*args_)); |
EXTENSION_FUNCTION_VALIDATE(params.get()); |
@@ -408,7 +408,7 @@ bool AddUrlHistoryFunction::RunImpl() { |
return true; |
} |
-bool DeleteUrlHistoryFunction::RunImpl() { |
+bool HistoryDeleteUrlFunction::RunImpl() { |
scoped_ptr<DeleteUrl::Params> params(DeleteUrl::Params::Create(*args_)); |
EXTENSION_FUNCTION_VALIDATE(params.get()); |
@@ -425,7 +425,7 @@ bool DeleteUrlHistoryFunction::RunImpl() { |
return true; |
} |
-bool DeleteRangeHistoryFunction::RunAsyncImpl() { |
+bool HistoryDeleteRangeFunction::RunAsyncImpl() { |
scoped_ptr<DeleteRange::Params> params(DeleteRange::Params::Create(*args_)); |
EXTENSION_FUNCTION_VALIDATE(params.get()); |
@@ -440,18 +440,18 @@ bool DeleteRangeHistoryFunction::RunAsyncImpl() { |
restrict_urls, |
start_time, |
end_time, |
- base::Bind(&DeleteRangeHistoryFunction::DeleteComplete, |
+ base::Bind(&HistoryDeleteRangeFunction::DeleteComplete, |
base::Unretained(this)), |
&task_tracker_); |
return true; |
} |
-void DeleteRangeHistoryFunction::DeleteComplete() { |
+void HistoryDeleteRangeFunction::DeleteComplete() { |
SendAsyncResponse(); |
} |
-bool DeleteAllHistoryFunction::RunAsyncImpl() { |
+bool HistoryDeleteAllFunction::RunAsyncImpl() { |
std::set<GURL> restrict_urls; |
HistoryService* hs = |
HistoryServiceFactory::GetForProfile(profile(), |
@@ -460,14 +460,14 @@ bool DeleteAllHistoryFunction::RunAsyncImpl() { |
restrict_urls, |
base::Time::UnixEpoch(), // From the beginning of the epoch. |
base::Time::Now(), // To the current time. |
- base::Bind(&DeleteAllHistoryFunction::DeleteComplete, |
+ base::Bind(&HistoryDeleteAllFunction::DeleteComplete, |
base::Unretained(this)), |
&task_tracker_); |
return true; |
} |
-void DeleteAllHistoryFunction::DeleteComplete() { |
+void HistoryDeleteAllFunction::DeleteComplete() { |
SendAsyncResponse(); |
} |