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

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

Issue 2276823003: Change many chrome/browser includes to use qualified paths. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 3 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 <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/memory/ref_counted_memory.h" 10 #include "base/memory/ref_counted_memory.h"
11 #include "base/strings/string16.h" 11 #include "base/strings/string16.h"
12 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
13 #include "build/build_config.h" 13 #include "build/build_config.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/browser_resources.h"
22 #include "chrome/grit/generated_resources.h" 23 #include "chrome/grit/generated_resources.h"
24 #include "chrome/grit/theme_resources.h"
23 #include "components/browsing_data_ui/history_notice_utils.h" 25 #include "components/browsing_data_ui/history_notice_utils.h"
26 #include "components/grit/components_scaled_resources.h"
24 #include "components/prefs/pref_service.h" 27 #include "components/prefs/pref_service.h"
25 #include "components/search/search.h" 28 #include "components/search/search.h"
26 #include "components/signin/core/browser/signin_manager.h" 29 #include "components/signin/core/browser/signin_manager.h"
30 #include "components/strings/grit/components_strings.h"
27 #include "content/public/browser/web_contents.h" 31 #include "content/public/browser/web_contents.h"
28 #include "content/public/browser/web_ui.h" 32 #include "content/public/browser/web_ui.h"
29 #include "content/public/browser/web_ui_data_source.h" 33 #include "content/public/browser/web_ui_data_source.h"
30 #include "grit/browser_resources.h"
31 #include "grit/components_scaled_resources.h"
32 #include "grit/components_strings.h"
33 #include "grit/theme_resources.h"
34 #include "ui/base/l10n/l10n_util.h" 34 #include "ui/base/l10n/l10n_util.h"
35 #include "ui/base/resource/resource_bundle.h" 35 #include "ui/base/resource/resource_bundle.h"
36 36
37 #if !defined(OS_ANDROID) 37 #if !defined(OS_ANDROID)
38 #include "chrome/browser/ui/webui/foreign_session_handler.h" 38 #include "chrome/browser/ui/webui/foreign_session_handler.h"
39 #include "chrome/browser/ui/webui/history_login_handler.h" 39 #include "chrome/browser/ui/webui/history_login_handler.h"
40 #endif 40 #endif
41 41
42 static const char kStringsJsFile[] = "strings.js"; 42 static const char kStringsJsFile[] = "strings.js";
43 static const char kHistoryJsFile[] = "history.js"; 43 static const char kHistoryJsFile[] = "history.js";
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 } 202 }
203 203
204 HistoryUI::~HistoryUI() {} 204 HistoryUI::~HistoryUI() {}
205 205
206 // static 206 // static
207 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes( 207 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes(
208 ui::ScaleFactor scale_factor) { 208 ui::ScaleFactor scale_factor) {
209 return ResourceBundle::GetSharedInstance(). 209 return ResourceBundle::GetSharedInstance().
210 LoadDataResourceBytesForScale(IDR_HISTORY_FAVICON, scale_factor); 210 LoadDataResourceBytesForScale(IDR_HISTORY_FAVICON, scale_factor);
211 } 211 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698