| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/ui/webui/history_ui.h" | 5 #include "chrome/browser/ui/webui/history_ui.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 477 ChromeURLDataManager::AddDataSource(profile, html_source); | 477 ChromeURLDataManager::AddDataSource(profile, html_source); |
| 478 } | 478 } |
| 479 | 479 |
| 480 // static | 480 // static |
| 481 const GURL HistoryUI::GetHistoryURLWithSearchText(const string16& text) { | 481 const GURL HistoryUI::GetHistoryURLWithSearchText(const string16& text) { |
| 482 return GURL(std::string(chrome::kChromeUIHistoryURL) + "#q=" + | 482 return GURL(std::string(chrome::kChromeUIHistoryURL) + "#q=" + |
| 483 net::EscapeQueryParamValue(UTF16ToUTF8(text), true)); | 483 net::EscapeQueryParamValue(UTF16ToUTF8(text), true)); |
| 484 } | 484 } |
| 485 | 485 |
| 486 // static | 486 // static |
| 487 RefCountedMemory* HistoryUI::GetFaviconResourceBytes() { | 487 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes() { |
| 488 return ResourceBundle::GetSharedInstance(). | 488 return ResourceBundle::GetSharedInstance(). |
| 489 LoadDataResourceBytes(IDR_HISTORY_FAVICON); | 489 LoadDataResourceBytes(IDR_HISTORY_FAVICON); |
| 490 } | 490 } |
| OLD | NEW |