diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-24 15:11:05 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-24 15:11:05 +0000 |
| commit | 95cdbbc0bad36451f935e41984e774aecfd02623 (patch) | |
| tree | 7b6b8b695aa34dc9a12858dd3c7637154ce2c32d /chrome/browser/dom_ui | |
| parent | f50e9970d0aa02dcd35f10df4c4deb4568acab51 (diff) | |
| download | chromium_src-95cdbbc0bad36451f935e41984e774aecfd02623.zip chromium_src-95cdbbc0bad36451f935e41984e774aecfd02623.tar.gz chromium_src-95cdbbc0bad36451f935e41984e774aecfd02623.tar.bz2 | |
Add some browser/dom_ui files to Mac and Linux. Fix errors exposed by GCC.
Review URL: http://codereview.chromium.org/27090
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10257 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
| -rw-r--r-- | chrome/browser/dom_ui/dom_ui.h | 2 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/history_ui.cc | 11 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/history_ui.h | 7 |
3 files changed, 11 insertions, 9 deletions
diff --git a/chrome/browser/dom_ui/dom_ui.h b/chrome/browser/dom_ui/dom_ui.h index ff0f96f..a1b25ec 100644 --- a/chrome/browser/dom_ui/dom_ui.h +++ b/chrome/browser/dom_ui/dom_ui.h @@ -91,4 +91,4 @@ class DOMMessageHandler { }; -#endif // CHROME_BROWSER_DOM_UI_H__
\ No newline at end of file +#endif // CHROME_BROWSER_DOM_UI_H__ diff --git a/chrome/browser/dom_ui/history_ui.cc b/chrome/browser/dom_ui/history_ui.cc index 48a4f7fd..c1c0805 100644 --- a/chrome/browser/dom_ui/history_ui.cc +++ b/chrome/browser/dom_ui/history_ui.cc @@ -6,6 +6,7 @@ #include "base/message_loop.h" #include "base/string_piece.h" +#include "base/string_util.h" #include "base/thread.h" #include "base/time.h" #include "base/time_format.h" @@ -92,8 +93,8 @@ void HistoryUIHTMLSource::StartDataRequest(const std::string& path, //////////////////////////////////////////////////////////////////////////////// BrowsingHistoryHandler::BrowsingHistoryHandler(DOMUI* dom_ui) : DOMMessageHandler(dom_ui), - remover_(NULL), - search_text_() { + search_text_(), + remover_(NULL) { dom_ui_->RegisterMessageCallback("getHistory", NewCallback(this, &BrowsingHistoryHandler::HandleGetHistory)); dom_ui_->RegisterMessageCallback("searchHistory", @@ -248,8 +249,8 @@ void BrowsingHistoryHandler::QueryComplete( results_value.Append(page_value); } - dom_ui_->CallJavascriptFunction(L"historyResult", - StringValue(search_text_), results_value); + StringValue temp(search_text_); + dom_ui_->CallJavascriptFunction(L"historyResult", temp, results_value); } void BrowsingHistoryHandler::ExtractSearchHistoryArguments(const Value* value, @@ -275,7 +276,7 @@ void BrowsingHistoryHandler::ExtractSearchHistoryArguments(const Value* value, static_cast<const StringValue*>(list_member); std::wstring wstring_value; string_value->GetAsString(&wstring_value); - *month = _wtoi(wstring_value.c_str()); + *month = StringToInt(wstring_value); } } } diff --git a/chrome/browser/dom_ui/history_ui.h b/chrome/browser/dom_ui/history_ui.h index 96efd3e..133cb96 100644 --- a/chrome/browser/dom_ui/history_ui.h +++ b/chrome/browser/dom_ui/history_ui.h @@ -9,6 +9,7 @@ #include "chrome/browser/dom_ui/chrome_url_data_manager.h" #include "chrome/browser/dom_ui/dom_ui.h" #include "chrome/browser/dom_ui/dom_ui_contents.h" +#include "chrome/browser/cancelable_request.h" class GURL; @@ -70,9 +71,9 @@ class BrowsingHistoryHandler : public DOMMessageHandler, // Browsing history remover BrowsingDataRemover* remover_; - + // Our consumer for the history service. - CancelableRequestConsumerT<PageUsageData*, NULL> cancelable_consumer_; + CancelableRequestConsumerTSimple<PageUsageData*> cancelable_consumer_; DISALLOW_COPY_AND_ASSIGN(BrowsingHistoryHandler); }; @@ -93,4 +94,4 @@ class HistoryUI : public DOMUI { DISALLOW_COPY_AND_ASSIGN(HistoryUI); }; -#endif // CHROME_BROWSER_DOM_UI_HISTORY_UI_H__
\ No newline at end of file +#endif // CHROME_BROWSER_DOM_UI_HISTORY_UI_H__ |