| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/history2_ui.h" | 5 #include "chrome/browser/dom_ui/history2_ui.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <set> | 8 #include <set> |
| 9 | 9 |
| 10 #include "app/l10n_util.h" | 10 #include "app/l10n_util.h" |
| 11 #include "app/resource_bundle.h" | 11 #include "app/resource_bundle.h" |
| 12 #include "base/callback.h" | 12 #include "base/callback.h" |
| 13 #include "base/i18n/time_formatting.h" | 13 #include "base/i18n/time_formatting.h" |
| 14 #include "base/message_loop.h" | 14 #include "base/message_loop.h" |
| 15 #include "base/singleton.h" | 15 #include "base/singleton.h" |
| 16 #include "base/string16.h" | 16 #include "base/string16.h" |
| 17 #include "base/string_number_conversions.h" | 17 #include "base/string_number_conversions.h" |
| 18 #include "base/string_piece.h" | 18 #include "base/string_piece.h" |
| 19 #include "base/utf_string_conversions.h" | 19 #include "base/utf_string_conversions.h" |
| 20 #include "base/thread.h" | 20 #include "base/threading/thread.h" |
| 21 #include "base/time.h" | 21 #include "base/time.h" |
| 22 #include "base/values.h" | 22 #include "base/values.h" |
| 23 #include "chrome/browser/bookmarks/bookmark_model.h" | 23 #include "chrome/browser/bookmarks/bookmark_model.h" |
| 24 #include "chrome/browser/browser_thread.h" | 24 #include "chrome/browser/browser_thread.h" |
| 25 #include "chrome/browser/dom_ui/dom_ui_favicon_source.h" | 25 #include "chrome/browser/dom_ui/dom_ui_favicon_source.h" |
| 26 #include "chrome/browser/metrics/user_metrics.h" | 26 #include "chrome/browser/metrics/user_metrics.h" |
| 27 #include "chrome/browser/history/history_types.h" | 27 #include "chrome/browser/history/history_types.h" |
| 28 #include "chrome/browser/profiles/profile.h" | 28 #include "chrome/browser/profiles/profile.h" |
| 29 #include "chrome/browser/tab_contents/tab_contents.h" | 29 #include "chrome/browser/tab_contents/tab_contents.h" |
| 30 #include "chrome/browser/tab_contents/tab_contents_delegate.h" | 30 #include "chrome/browser/tab_contents/tab_contents_delegate.h" |
| (...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 413 const GURL HistoryUI2::GetHistoryURLWithSearchText(const string16& text) { | 413 const GURL HistoryUI2::GetHistoryURLWithSearchText(const string16& text) { |
| 414 return GURL(std::string(chrome::kChromeUIHistory2URL) + "#q=" + | 414 return GURL(std::string(chrome::kChromeUIHistory2URL) + "#q=" + |
| 415 EscapeQueryParamValue(UTF16ToUTF8(text), true)); | 415 EscapeQueryParamValue(UTF16ToUTF8(text), true)); |
| 416 } | 416 } |
| 417 | 417 |
| 418 // static | 418 // static |
| 419 RefCountedMemory* HistoryUI2::GetFaviconResourceBytes() { | 419 RefCountedMemory* HistoryUI2::GetFaviconResourceBytes() { |
| 420 return ResourceBundle::GetSharedInstance(). | 420 return ResourceBundle::GetSharedInstance(). |
| 421 LoadDataResourceBytes(IDR_HISTORY_FAVICON); | 421 LoadDataResourceBytes(IDR_HISTORY_FAVICON); |
| 422 } | 422 } |
| OLD | NEW |