OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/webui/history2_ui.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <set> | 8 #include <set> |
9 | 9 |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
11 #include "base/i18n/time_formatting.h" | 11 #include "base/i18n/time_formatting.h" |
12 #include "base/message_loop.h" | 12 #include "base/message_loop.h" |
13 #include "base/singleton.h" | 13 #include "base/singleton.h" |
14 #include "base/string16.h" | 14 #include "base/string16.h" |
15 #include "base/string_number_conversions.h" | 15 #include "base/string_number_conversions.h" |
16 #include "base/string_piece.h" | 16 #include "base/string_piece.h" |
17 #include "base/utf_string_conversions.h" | |
18 #include "base/threading/thread.h" | 17 #include "base/threading/thread.h" |
19 #include "base/time.h" | 18 #include "base/time.h" |
| 19 #include "base/utf_string_conversions.h" |
20 #include "base/values.h" | 20 #include "base/values.h" |
21 #include "chrome/browser/bookmarks/bookmark_model.h" | 21 #include "chrome/browser/bookmarks/bookmark_model.h" |
22 #include "chrome/browser/browser_thread.h" | 22 #include "chrome/browser/browser_thread.h" |
23 #include "chrome/browser/dom_ui/web_ui_favicon_source.h" | 23 #include "chrome/browser/dom_ui/web_ui_favicon_source.h" |
| 24 #include "chrome/browser/history/history_types.h" |
24 #include "chrome/browser/metrics/user_metrics.h" | 25 #include "chrome/browser/metrics/user_metrics.h" |
25 #include "chrome/browser/history/history_types.h" | |
26 #include "chrome/browser/profiles/profile.h" | 26 #include "chrome/browser/profiles/profile.h" |
27 #include "chrome/browser/tab_contents/tab_contents.h" | 27 #include "chrome/browser/tab_contents/tab_contents.h" |
28 #include "chrome/browser/tab_contents/tab_contents_delegate.h" | 28 #include "chrome/browser/tab_contents/tab_contents_delegate.h" |
29 #include "chrome/browser/ui/browser.h" | 29 #include "chrome/browser/ui/browser.h" |
30 #include "chrome/browser/ui/browser_list.h" | 30 #include "chrome/browser/ui/browser_list.h" |
31 #include "chrome/common/jstemplate_builder.h" | 31 #include "chrome/common/jstemplate_builder.h" |
32 #include "chrome/common/notification_source.h" | 32 #include "chrome/common/notification_source.h" |
33 #include "chrome/common/time_format.h" | 33 #include "chrome/common/time_format.h" |
34 #include "chrome/common/url_constants.h" | 34 #include "chrome/common/url_constants.h" |
35 #include "grit/browser_resources.h" | 35 #include "grit/browser_resources.h" |
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
404 const GURL HistoryUI2::GetHistoryURLWithSearchText(const string16& text) { | 404 const GURL HistoryUI2::GetHistoryURLWithSearchText(const string16& text) { |
405 return GURL(std::string(chrome::kChromeUIHistory2URL) + "#q=" + | 405 return GURL(std::string(chrome::kChromeUIHistory2URL) + "#q=" + |
406 EscapeQueryParamValue(UTF16ToUTF8(text), true)); | 406 EscapeQueryParamValue(UTF16ToUTF8(text), true)); |
407 } | 407 } |
408 | 408 |
409 // static | 409 // static |
410 RefCountedMemory* HistoryUI2::GetFaviconResourceBytes() { | 410 RefCountedMemory* HistoryUI2::GetFaviconResourceBytes() { |
411 return ResourceBundle::GetSharedInstance(). | 411 return ResourceBundle::GetSharedInstance(). |
412 LoadDataResourceBytes(IDR_HISTORY_FAVICON); | 412 LoadDataResourceBytes(IDR_HISTORY_FAVICON); |
413 } | 413 } |
OLD | NEW |