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

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

Issue 404883002: Allow extension APIs to be called from WebUI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: android compile Created 6 years, 5 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/extensions/extension_webui_apitest.cc ('k') | chrome/chrome_tests.gypi » ('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) 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 #include "content/public/browser/web_ui_data_source.h" 48 #include "content/public/browser/web_ui_data_source.h"
49 #include "grit/browser_resources.h" 49 #include "grit/browser_resources.h"
50 #include "grit/generated_resources.h" 50 #include "grit/generated_resources.h"
51 #include "grit/theme_resources.h" 51 #include "grit/theme_resources.h"
52 #include "net/base/escape.h" 52 #include "net/base/escape.h"
53 #include "net/base/net_util.h" 53 #include "net/base/net_util.h"
54 #include "sync/protocol/history_delete_directive_specifics.pb.h" 54 #include "sync/protocol/history_delete_directive_specifics.pb.h"
55 #include "ui/base/l10n/l10n_util.h" 55 #include "ui/base/l10n/l10n_util.h"
56 #include "ui/base/l10n/time_format.h" 56 #include "ui/base/l10n/time_format.h"
57 #include "ui/base/resource/resource_bundle.h" 57 #include "ui/base/resource/resource_bundle.h"
58 #include "ui/base/webui/web_ui_util.h"
58 59
59 #if defined(ENABLE_EXTENSIONS) 60 #if defined(ENABLE_EXTENSIONS)
60 #include "chrome/browser/extensions/activity_log/activity_log.h" 61 #include "chrome/browser/extensions/activity_log/activity_log.h"
61 #endif 62 #endif
62 63
63 #if defined(ENABLE_MANAGED_USERS) 64 #if defined(ENABLE_MANAGED_USERS)
64 #include "chrome/browser/supervised_user/supervised_user_navigation_observer.h" 65 #include "chrome/browser/supervised_user/supervised_user_navigation_observer.h"
65 #include "chrome/browser/supervised_user/supervised_user_service.h" 66 #include "chrome/browser/supervised_user/supervised_user_service.h"
66 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" 67 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
67 #include "chrome/browser/supervised_user/supervised_user_url_filter.h" 68 #include "chrome/browser/supervised_user/supervised_user_url_filter.h"
(...skipping 938 matching lines...) Expand 10 before | Expand all | Expand 10 after
1006 Profile* profile = Profile::FromWebUI(web_ui); 1007 Profile* profile = Profile::FromWebUI(web_ui);
1007 content::WebUIDataSource::Add(profile, CreateHistoryUIHTMLSource(profile)); 1008 content::WebUIDataSource::Add(profile, CreateHistoryUIHTMLSource(profile));
1008 } 1009 }
1009 1010
1010 // static 1011 // static
1011 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes( 1012 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes(
1012 ui::ScaleFactor scale_factor) { 1013 ui::ScaleFactor scale_factor) {
1013 return ResourceBundle::GetSharedInstance(). 1014 return ResourceBundle::GetSharedInstance().
1014 LoadDataResourceBytesForScale(IDR_HISTORY_FAVICON, scale_factor); 1015 LoadDataResourceBytesForScale(IDR_HISTORY_FAVICON, scale_factor);
1015 } 1016 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_webui_apitest.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698