| OLD | NEW |
| 1 // Copyright (c) 2011 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" |
| 11 #include "base/callback_old.h" | |
| 12 #include "base/i18n/time_formatting.h" | 11 #include "base/i18n/time_formatting.h" |
| 13 #include "base/memory/singleton.h" | 12 #include "base/memory/singleton.h" |
| 14 #include "base/message_loop.h" | 13 #include "base/message_loop.h" |
| 15 #include "base/string16.h" | 14 #include "base/string16.h" |
| 16 #include "base/string_number_conversions.h" | 15 #include "base/string_number_conversions.h" |
| 17 #include "base/string_piece.h" | 16 #include "base/string_piece.h" |
| 18 #include "base/threading/thread.h" | 17 #include "base/threading/thread.h" |
| 19 #include "base/time.h" | 18 #include "base/time.h" |
| 20 #include "base/utf_string_conversions.h" | 19 #include "base/utf_string_conversions.h" |
| 21 #include "base/values.h" | 20 #include "base/values.h" |
| (...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 438 const GURL HistoryUI::GetHistoryURLWithSearchText(const string16& text) { | 437 const GURL HistoryUI::GetHistoryURLWithSearchText(const string16& text) { |
| 439 return GURL(std::string(chrome::kChromeUIHistoryURL) + "#q=" + | 438 return GURL(std::string(chrome::kChromeUIHistoryURL) + "#q=" + |
| 440 net::EscapeQueryParamValue(UTF16ToUTF8(text), true)); | 439 net::EscapeQueryParamValue(UTF16ToUTF8(text), true)); |
| 441 } | 440 } |
| 442 | 441 |
| 443 // static | 442 // static |
| 444 RefCountedMemory* HistoryUI::GetFaviconResourceBytes() { | 443 RefCountedMemory* HistoryUI::GetFaviconResourceBytes() { |
| 445 return ResourceBundle::GetSharedInstance(). | 444 return ResourceBundle::GetSharedInstance(). |
| 446 LoadDataResourceBytes(IDR_HISTORY_FAVICON); | 445 LoadDataResourceBytes(IDR_HISTORY_FAVICON); |
| 447 } | 446 } |
| OLD | NEW |