| 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/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 12 matching lines...) Expand all Loading... |
| 23 #include "chrome/browser/history/history_notifications.h" | 23 #include "chrome/browser/history/history_notifications.h" |
| 24 #include "chrome/browser/history/history_types.h" | 24 #include "chrome/browser/history/history_types.h" |
| 25 #include "chrome/browser/profiles/profile.h" | 25 #include "chrome/browser/profiles/profile.h" |
| 26 #include "chrome/browser/ui/browser.h" | 26 #include "chrome/browser/ui/browser.h" |
| 27 #include "chrome/browser/ui/browser_list.h" | 27 #include "chrome/browser/ui/browser_list.h" |
| 28 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" | 28 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" |
| 29 #include "chrome/browser/ui/webui/favicon_source.h" | 29 #include "chrome/browser/ui/webui/favicon_source.h" |
| 30 #include "chrome/common/chrome_notification_types.h" | 30 #include "chrome/common/chrome_notification_types.h" |
| 31 #include "chrome/common/time_format.h" | 31 #include "chrome/common/time_format.h" |
| 32 #include "chrome/common/url_constants.h" | 32 #include "chrome/common/url_constants.h" |
| 33 #include "content/browser/webui/web_ui.h" |
| 33 #include "content/public/browser/notification_details.h" | 34 #include "content/public/browser/notification_details.h" |
| 34 #include "content/public/browser/notification_source.h" | 35 #include "content/public/browser/notification_source.h" |
| 35 #include "content/public/browser/user_metrics.h" | 36 #include "content/public/browser/user_metrics.h" |
| 36 #include "content/public/browser/web_contents.h" | 37 #include "content/public/browser/web_contents.h" |
| 37 #include "content/public/browser/web_contents_delegate.h" | 38 #include "content/public/browser/web_contents_delegate.h" |
| 38 #include "grit/browser_resources.h" | 39 #include "grit/browser_resources.h" |
| 39 #include "grit/chromium_strings.h" | 40 #include "grit/chromium_strings.h" |
| 40 #include "grit/generated_resources.h" | 41 #include "grit/generated_resources.h" |
| 41 #include "grit/locale_settings.h" | 42 #include "grit/locale_settings.h" |
| 42 #include "grit/theme_resources.h" | 43 #include "grit/theme_resources.h" |
| (...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 437 const GURL HistoryUI::GetHistoryURLWithSearchText(const string16& text) { | 438 const GURL HistoryUI::GetHistoryURLWithSearchText(const string16& text) { |
| 438 return GURL(std::string(chrome::kChromeUIHistoryURL) + "#q=" + | 439 return GURL(std::string(chrome::kChromeUIHistoryURL) + "#q=" + |
| 439 net::EscapeQueryParamValue(UTF16ToUTF8(text), true)); | 440 net::EscapeQueryParamValue(UTF16ToUTF8(text), true)); |
| 440 } | 441 } |
| 441 | 442 |
| 442 // static | 443 // static |
| 443 RefCountedMemory* HistoryUI::GetFaviconResourceBytes() { | 444 RefCountedMemory* HistoryUI::GetFaviconResourceBytes() { |
| 444 return ResourceBundle::GetSharedInstance(). | 445 return ResourceBundle::GetSharedInstance(). |
| 445 LoadDataResourceBytes(IDR_HISTORY_FAVICON); | 446 LoadDataResourceBytes(IDR_HISTORY_FAVICON); |
| 446 } | 447 } |
| OLD | NEW |