Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(246)

Side by Side Diff: chrome/browser/webui/history_ui.cc

Issue 6531028: WebUI: Move more files from chrome/browser/dom_ui to chrome/browser/webui. Part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/webui/history_ui.h ('k') | chrome/browser/webui/keyboard_ui.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/history_ui.h" 5 #include "chrome/browser/webui/history_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/threading/thread.h" 17 #include "base/threading/thread.h"
18 #include "base/time.h" 18 #include "base/time.h"
19 #include "base/utf_string_conversions.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_delegate.h" 28 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
28 #include "chrome/browser/tab_contents/tab_contents.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"
36 #include "grit/chromium_strings.h" 36 #include "grit/chromium_strings.h"
37 #include "grit/generated_resources.h" 37 #include "grit/generated_resources.h"
38 #include "grit/locale_settings.h" 38 #include "grit/locale_settings.h"
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 const GURL HistoryUI::GetHistoryURLWithSearchText(const string16& text) { 392 const GURL HistoryUI::GetHistoryURLWithSearchText(const string16& text) {
393 return GURL(std::string(chrome::kChromeUIHistoryURL) + "#q=" + 393 return GURL(std::string(chrome::kChromeUIHistoryURL) + "#q=" +
394 EscapeQueryParamValue(UTF16ToUTF8(text), true)); 394 EscapeQueryParamValue(UTF16ToUTF8(text), true));
395 } 395 }
396 396
397 // static 397 // static
398 RefCountedMemory* HistoryUI::GetFaviconResourceBytes() { 398 RefCountedMemory* HistoryUI::GetFaviconResourceBytes() {
399 return ResourceBundle::GetSharedInstance(). 399 return ResourceBundle::GetSharedInstance().
400 LoadDataResourceBytes(IDR_HISTORY_FAVICON); 400 LoadDataResourceBytes(IDR_HISTORY_FAVICON);
401 } 401 }
OLDNEW
« no previous file with comments | « chrome/browser/webui/history_ui.h ('k') | chrome/browser/webui/keyboard_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698