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

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

Issue 284893003: Move bookmarks/core/... to bookmarks/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing errors reported by presubmit Created 6 years, 7 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
OLDNEW
1 // Copyright (c) 2012 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"
(...skipping 22 matching lines...) Expand all
33 #include "chrome/browser/sync/glue/device_info.h" 33 #include "chrome/browser/sync/glue/device_info.h"
34 #include "chrome/browser/sync/profile_sync_service.h" 34 #include "chrome/browser/sync/profile_sync_service.h"
35 #include "chrome/browser/sync/profile_sync_service_factory.h" 35 #include "chrome/browser/sync/profile_sync_service_factory.h"
36 #include "chrome/browser/ui/browser_finder.h" 36 #include "chrome/browser/ui/browser_finder.h"
37 #include "chrome/browser/ui/chrome_pages.h" 37 #include "chrome/browser/ui/chrome_pages.h"
38 #include "chrome/browser/ui/webui/favicon_source.h" 38 #include "chrome/browser/ui/webui/favicon_source.h"
39 #include "chrome/browser/ui/webui/metrics_handler.h" 39 #include "chrome/browser/ui/webui/metrics_handler.h"
40 #include "chrome/common/chrome_switches.h" 40 #include "chrome/common/chrome_switches.h"
41 #include "chrome/common/pref_names.h" 41 #include "chrome/common/pref_names.h"
42 #include "chrome/common/url_constants.h" 42 #include "chrome/common/url_constants.h"
43 #include "components/bookmarks/core/browser/bookmark_model.h" 43 #include "components/bookmarks/browser/bookmark_model.h"
44 #include "components/bookmarks/core/browser/bookmark_utils.h" 44 #include "components/bookmarks/browser/bookmark_utils.h"
45 #include "content/public/browser/notification_details.h" 45 #include "content/public/browser/notification_details.h"
46 #include "content/public/browser/notification_source.h" 46 #include "content/public/browser/notification_source.h"
47 #include "content/public/browser/url_data_source.h" 47 #include "content/public/browser/url_data_source.h"
48 #include "content/public/browser/web_ui.h" 48 #include "content/public/browser/web_ui.h"
49 #include "content/public/browser/web_ui_data_source.h" 49 #include "content/public/browser/web_ui_data_source.h"
50 #include "grit/browser_resources.h" 50 #include "grit/browser_resources.h"
51 #include "grit/generated_resources.h" 51 #include "grit/generated_resources.h"
52 #include "grit/theme_resources.h" 52 #include "grit/theme_resources.h"
53 #include "net/base/escape.h" 53 #include "net/base/escape.h"
54 #include "net/base/net_util.h" 54 #include "net/base/net_util.h"
(...skipping 946 matching lines...) Expand 10 before | Expand all | Expand 10 after
1001 Profile* profile = Profile::FromWebUI(web_ui); 1001 Profile* profile = Profile::FromWebUI(web_ui);
1002 content::WebUIDataSource::Add(profile, CreateHistoryUIHTMLSource(profile)); 1002 content::WebUIDataSource::Add(profile, CreateHistoryUIHTMLSource(profile));
1003 } 1003 }
1004 1004
1005 // static 1005 // static
1006 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes( 1006 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes(
1007 ui::ScaleFactor scale_factor) { 1007 ui::ScaleFactor scale_factor) {
1008 return ResourceBundle::GetSharedInstance(). 1008 return ResourceBundle::GetSharedInstance().
1009 LoadDataResourceBytesForScale(IDR_HISTORY_FAVICON, scale_factor); 1009 LoadDataResourceBytesForScale(IDR_HISTORY_FAVICON, scale_factor);
1010 } 1010 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/toolbar/wrench_menu.cc ('k') | chrome/browser/undo/bookmark_undo_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698