diff options
Diffstat (limited to 'chrome/browser/dom_ui')
-rw-r--r-- | chrome/browser/dom_ui/chrome_url_data_manager.cc | 2 | ||||
-rw-r--r-- | chrome/browser/dom_ui/dom_ui.cc | 8 | ||||
-rw-r--r-- | chrome/browser/dom_ui/dom_ui.h | 2 | ||||
-rw-r--r-- | chrome/browser/dom_ui/dom_ui_contents.h | 2 | ||||
-rw-r--r-- | chrome/browser/dom_ui/fileicon_source.cc | 4 | ||||
-rw-r--r-- | chrome/browser/dom_ui/history_ui.cc | 4 | ||||
-rw-r--r-- | chrome/browser/dom_ui/history_ui.h | 6 | ||||
-rw-r--r-- | chrome/browser/dom_ui/new_tab_ui.h | 4 |
8 files changed, 16 insertions, 16 deletions
diff --git a/chrome/browser/dom_ui/chrome_url_data_manager.cc b/chrome/browser/dom_ui/chrome_url_data_manager.cc index 89cfe89..532c117 100644 --- a/chrome/browser/dom_ui/chrome_url_data_manager.cc +++ b/chrome/browser/dom_ui/chrome_url_data_manager.cc @@ -105,7 +105,7 @@ void RegisterURLRequestChromeJob() { #ifdef CHROME_PERSONALIZATION url_util::AddStandardScheme(kPersonalizationScheme); URLRequest::RegisterProtocolFactory(kPersonalizationScheme, - &ChromeURLDataManager::Factory); + &ChromeURLDataManager::Factory); #endif } diff --git a/chrome/browser/dom_ui/dom_ui.cc b/chrome/browser/dom_ui/dom_ui.cc index 9b8b069..1f01e7d 100644 --- a/chrome/browser/dom_ui/dom_ui.cc +++ b/chrome/browser/dom_ui/dom_ui.cc @@ -27,7 +27,7 @@ DOMUI::~DOMUI() { void DOMUI::ProcessDOMUIMessage(const std::string& message, const std::string& content) { // Look up the callback for this message. - MessageCallbackMap::const_iterator callback = + MessageCallbackMap::const_iterator callback = message_callbacks_.find(message); if (callback == message_callbacks_.end()) return; @@ -74,7 +74,7 @@ void DOMUI::CallJavascriptFunction( ExecuteJavascript(javascript); } -void DOMUI::RegisterMessageCallback(const std::string &message, +void DOMUI::RegisterMessageCallback(const std::string &message, MessageCallback *callback) { message_callbacks_.insert(std::make_pair(message, callback)); } @@ -99,7 +99,7 @@ void DOMUI::AddMessageHandler(DOMMessageHandler* handler) { void DOMUI::ExecuteJavascript(const std::wstring& javascript) { DCHECK(contents_); - contents_->render_view_host()->ExecuteJavascriptInWebFrame(std::wstring(), + contents_->render_view_host()->ExecuteJavascriptInWebFrame(std::wstring(), javascript); } @@ -111,7 +111,7 @@ DOMMessageHandler::DOMMessageHandler(DOMUI *dom_ui) : dom_ui_(dom_ui) { // DOMMessageHandler, protected: ---------------------------------------------- -void DOMMessageHandler::SetURLAndTitle(DictionaryValue* dictionary, +void DOMMessageHandler::SetURLAndTitle(DictionaryValue* dictionary, std::wstring title, const GURL& gurl) { std::wstring wstring_url = UTF8ToWide(gurl.spec()); diff --git a/chrome/browser/dom_ui/dom_ui.h b/chrome/browser/dom_ui/dom_ui.h index 3164d64..35388bd 100644 --- a/chrome/browser/dom_ui/dom_ui.h +++ b/chrome/browser/dom_ui/dom_ui.h @@ -91,7 +91,7 @@ class DOMMessageHandler { protected: // Adds "url" and "title" keys on incoming dictionary, setting title // as the url as a fallback on empty title. - static void SetURLAndTitle(DictionaryValue* dictionary, + static void SetURLAndTitle(DictionaryValue* dictionary, std::wstring title, const GURL& gurl); diff --git a/chrome/browser/dom_ui/dom_ui_contents.h b/chrome/browser/dom_ui/dom_ui_contents.h index 241f97f..42bfe89 100644 --- a/chrome/browser/dom_ui/dom_ui_contents.h +++ b/chrome/browser/dom_ui/dom_ui_contents.h @@ -119,7 +119,7 @@ class DOMUIContents : public WebContents { // // TabContents overrides - // + // virtual void UpdateHistoryForNavigation(const GURL& url, const ViewHostMsg_FrameNavigate_Params& params) { } virtual bool NavigateToPendingEntry(bool reload); diff --git a/chrome/browser/dom_ui/fileicon_source.cc b/chrome/browser/dom_ui/fileicon_source.cc index c2f75c4..d1e507c 100644 --- a/chrome/browser/dom_ui/fileicon_source.cc +++ b/chrome/browser/dom_ui/fileicon_source.cc @@ -41,7 +41,7 @@ void FileIconSource::StartDataRequest(const std::string& path, SendResponse(request_id, icon_data); } else { // Icon was not in cache, go fetch it slowly. - IconManager::Handle h = im->LoadIcon(UTF8ToWide(escaped_path), + IconManager::Handle h = im->LoadIcon(UTF8ToWide(escaped_path), IconLoader::NORMAL, &cancelable_consumer_, NewCallback(this, &FileIconSource::OnFileIconDataAvailable)); @@ -66,4 +66,4 @@ void FileIconSource::OnFileIconDataAvailable(IconManager::Handle handle, // TODO(glen): send a dummy icon. SendResponse(request_id, NULL); } -}
\ No newline at end of file +} diff --git a/chrome/browser/dom_ui/history_ui.cc b/chrome/browser/dom_ui/history_ui.cc index 9bc5d61..6e09592 100644 --- a/chrome/browser/dom_ui/history_ui.cc +++ b/chrome/browser/dom_ui/history_ui.cc @@ -186,7 +186,7 @@ void BrowsingHistoryHandler::HandleDeleteDay(const Value* value) { dom_ui_->CallJavascriptFunction(L"deleteFailed"); return; } - + // Anything in-flight is invalid. cancelable_consumer_.CancelAllRequests(); @@ -254,7 +254,7 @@ void BrowsingHistoryHandler::QueryComplete( base::TimeFormatShortDate(page.visit_time())); page_value->SetString(L"snippet", page.snippet().text()); } - page_value->SetBoolean(L"starred", + page_value->SetBoolean(L"starred", dom_ui_->get_profile()->GetBookmarkModel()->IsBookmarked(page.url())); results_value.Append(page_value); } diff --git a/chrome/browser/dom_ui/history_ui.h b/chrome/browser/dom_ui/history_ui.h index cc643b1..0902322 100644 --- a/chrome/browser/dom_ui/history_ui.h +++ b/chrome/browser/dom_ui/history_ui.h @@ -60,8 +60,8 @@ class BrowsingHistoryHandler : public DOMMessageHandler, history::QueryResults* results); // Extract the arguments from the call to HandleSearchHistory. - void ExtractSearchHistoryArguments(const Value* value, - int* month, + void ExtractSearchHistoryArguments(const Value* value, + int* month, std::wstring* query); // Figure out the query options for a month-wide query. @@ -72,7 +72,7 @@ class BrowsingHistoryHandler : public DOMMessageHandler, // Browsing history remover scoped_ptr<BrowsingDataRemover> remover_; - + // Our consumer for the history service. CancelableRequestConsumerTSimple<PageUsageData*> cancelable_consumer_; diff --git a/chrome/browser/dom_ui/new_tab_ui.h b/chrome/browser/dom_ui/new_tab_ui.h index 98b0abe..c5a3c27 100644 --- a/chrome/browser/dom_ui/new_tab_ui.h +++ b/chrome/browser/dom_ui/new_tab_ui.h @@ -228,8 +228,8 @@ class HistoryHandler : public DOMMessageHandler { // Let the page contents record UMA actions. Only use when you can't do it from // C++. For example, we currently use it to let the NTP log the postion of the -// Most Visited or Bookmark the user clicked on, as we don't get that -// information through RequestOpenURL. You will need to update the metrics +// Most Visited or Bookmark the user clicked on, as we don't get that +// information through RequestOpenURL. You will need to update the metrics // dashboard with the action names you use, as our processor won't catch that // information (treat it as RecordComputedMetrics) class MetricsHandler : public DOMMessageHandler { |