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

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

Issue 1566983004: Componentize the favicon for chrome://history (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 11 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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/memory/ref_counted_memory.h" 8 #include "base/memory/ref_counted_memory.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
11 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "build/build_config.h" 12 #include "build/build_config.h"
13 #include "chrome/browser/history/web_history_service_factory.h" 13 #include "chrome/browser/history/web_history_service_factory.h"
14 #include "chrome/browser/prefs/incognito_mode_prefs.h" 14 #include "chrome/browser/prefs/incognito_mode_prefs.h"
15 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/signin/signin_manager_factory.h" 16 #include "chrome/browser/signin/signin_manager_factory.h"
17 #include "chrome/browser/ui/webui/browsing_history_handler.h" 17 #include "chrome/browser/ui/webui/browsing_history_handler.h"
18 #include "chrome/browser/ui/webui/metrics_handler.h" 18 #include "chrome/browser/ui/webui/metrics_handler.h"
19 #include "chrome/common/chrome_switches.h" 19 #include "chrome/common/chrome_switches.h"
20 #include "chrome/common/pref_names.h" 20 #include "chrome/common/pref_names.h"
21 #include "chrome/common/url_constants.h" 21 #include "chrome/common/url_constants.h"
22 #include "chrome/grit/generated_resources.h" 22 #include "chrome/grit/generated_resources.h"
23 #include "components/search/search.h" 23 #include "components/search/search.h"
24 #include "components/signin/core/browser/signin_manager.h" 24 #include "components/signin/core/browser/signin_manager.h"
25 #include "content/public/browser/web_ui.h" 25 #include "content/public/browser/web_ui.h"
26 #include "content/public/browser/web_ui_data_source.h" 26 #include "content/public/browser/web_ui_data_source.h"
27 #include "grit/browser_resources.h" 27 #include "grit/browser_resources.h"
28 #include "grit/components_scaled_resources.h"
28 #include "grit/components_strings.h" 29 #include "grit/components_strings.h"
29 #include "grit/theme_resources.h" 30 #include "grit/theme_resources.h"
30 #include "ui/base/l10n/l10n_util.h" 31 #include "ui/base/l10n/l10n_util.h"
31 #include "ui/base/resource/resource_bundle.h" 32 #include "ui/base/resource/resource_bundle.h"
32 33
33 #if !defined(OS_ANDROID) && !defined(OS_IOS) 34 #if !defined(OS_ANDROID) && !defined(OS_IOS)
34 #include "chrome/browser/ui/webui/foreign_session_handler.h" 35 #include "chrome/browser/ui/webui/foreign_session_handler.h"
35 #include "chrome/browser/ui/webui/history_login_handler.h" 36 #include "chrome/browser/ui/webui/history_login_handler.h"
36 #endif 37 #endif
37 38
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 } 181 }
181 182
182 HistoryUI::~HistoryUI() {} 183 HistoryUI::~HistoryUI() {}
183 184
184 // static 185 // static
185 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes( 186 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes(
186 ui::ScaleFactor scale_factor) { 187 ui::ScaleFactor scale_factor) {
187 return ResourceBundle::GetSharedInstance(). 188 return ResourceBundle::GetSharedInstance().
188 LoadDataResourceBytesForScale(IDR_HISTORY_FAVICON, scale_factor); 189 LoadDataResourceBytesForScale(IDR_HISTORY_FAVICON, scale_factor);
189 } 190 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/toolbar/back_forward_menu_model.cc ('k') | chrome/browser/ui/webui/md_history_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698