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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
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/downloads_ui.h" 5 #include "chrome/browser/ui/webui/downloads_ui.h"
6 6
7 #include "base/memory/ref_counted_memory.h" 7 #include "base/memory/ref_counted_memory.h"
8 #include "base/memory/singleton.h" 8 #include "base/memory/singleton.h"
9 #include "base/prefs/pref_service.h"
10 #include "base/strings/string_piece.h" 9 #include "base/strings/string_piece.h"
11 #include "base/threading/thread.h" 10 #include "base/threading/thread.h"
12 #include "base/values.h" 11 #include "base/values.h"
13 #include "chrome/browser/defaults.h" 12 #include "chrome/browser/defaults.h"
14 #include "chrome/browser/download/download_service.h" 13 #include "chrome/browser/download/download_service.h"
15 #include "chrome/browser/download/download_service_factory.h" 14 #include "chrome/browser/download/download_service_factory.h"
16 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/ui/webui/downloads_dom_handler.h" 16 #include "chrome/browser/ui/webui/downloads_dom_handler.h"
18 #include "chrome/browser/ui/webui/theme_source.h" 17 #include "chrome/browser/ui/webui/theme_source.h"
19 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
20 #include "chrome/common/pref_names.h" 19 #include "chrome/common/pref_names.h"
21 #include "chrome/common/url_constants.h" 20 #include "chrome/common/url_constants.h"
22 #include "chrome/grit/chromium_strings.h" 21 #include "chrome/grit/chromium_strings.h"
23 #include "chrome/grit/generated_resources.h" 22 #include "chrome/grit/generated_resources.h"
23 #include "components/prefs/pref_service.h"
24 #include "content/public/browser/download_manager.h" 24 #include "content/public/browser/download_manager.h"
25 #include "content/public/browser/url_data_source.h" 25 #include "content/public/browser/url_data_source.h"
26 #include "content/public/browser/web_contents.h" 26 #include "content/public/browser/web_contents.h"
27 #include "content/public/browser/web_ui.h" 27 #include "content/public/browser/web_ui.h"
28 #include "content/public/browser/web_ui_data_source.h" 28 #include "content/public/browser/web_ui_data_source.h"
29 #include "grit/browser_resources.h" 29 #include "grit/browser_resources.h"
30 #include "grit/theme_resources.h" 30 #include "grit/theme_resources.h"
31 #include "ui/base/resource/resource_bundle.h" 31 #include "ui/base/resource/resource_bundle.h"
32 32
33 using content::BrowserContext; 33 using content::BrowserContext;
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 content::URLDataSource::Add(profile, theme); 127 content::URLDataSource::Add(profile, theme);
128 #endif 128 #endif
129 } 129 }
130 130
131 // static 131 // static
132 base::RefCountedMemory* DownloadsUI::GetFaviconResourceBytes( 132 base::RefCountedMemory* DownloadsUI::GetFaviconResourceBytes(
133 ui::ScaleFactor scale_factor) { 133 ui::ScaleFactor scale_factor) {
134 return ResourceBundle::GetSharedInstance(). 134 return ResourceBundle::GetSharedInstance().
135 LoadDataResourceBytesForScale(IDR_DOWNLOADS_FAVICON, scale_factor); 135 LoadDataResourceBytesForScale(IDR_DOWNLOADS_FAVICON, scale_factor);
136 } 136 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc ('k') | chrome/browser/ui/webui/downloads_ui_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698