| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/dom_ui/history_ui.h" | 5 #include "chrome/browser/dom_ui/history_ui.h" |
| 6 | 6 |
| 7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
| 8 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
| 9 #include "base/i18n/time_formatting.h" | 9 #include "base/i18n/time_formatting.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 370 ChromeThread::IO, FROM_HERE, | 370 ChromeThread::IO, FROM_HERE, |
| 371 NewRunnableMethod( | 371 NewRunnableMethod( |
| 372 Singleton<ChromeURLDataManager>::get(), | 372 Singleton<ChromeURLDataManager>::get(), |
| 373 &ChromeURLDataManager::AddDataSource, | 373 &ChromeURLDataManager::AddDataSource, |
| 374 make_scoped_refptr(html_source))); | 374 make_scoped_refptr(html_source))); |
| 375 } | 375 } |
| 376 | 376 |
| 377 // static | 377 // static |
| 378 const GURL HistoryUI::GetHistoryURLWithSearchText(const std::wstring& text) { | 378 const GURL HistoryUI::GetHistoryURLWithSearchText(const std::wstring& text) { |
| 379 return GURL(std::string(chrome::kChromeUIHistoryURL) + "#q=" + | 379 return GURL(std::string(chrome::kChromeUIHistoryURL) + "#q=" + |
| 380 EscapeQueryParamValue(WideToUTF8(text))); | 380 EscapeQueryParamValue(WideToUTF8(text), true)); |
| 381 } | 381 } |
| 382 | 382 |
| 383 // static | 383 // static |
| 384 RefCountedMemory* HistoryUI::GetFaviconResourceBytes() { | 384 RefCountedMemory* HistoryUI::GetFaviconResourceBytes() { |
| 385 return ResourceBundle::GetSharedInstance(). | 385 return ResourceBundle::GetSharedInstance(). |
| 386 LoadDataResourceBytes(IDR_HISTORY_FAVICON); | 386 LoadDataResourceBytes(IDR_HISTORY_FAVICON); |
| 387 } | 387 } |
| OLD | NEW |