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

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

Issue 10387010: Select theme resources from ResourceBundle at requested scale factor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with master. Created 8 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 | Annotate | Revision Log
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/string_piece.h" 9 #include "base/string_piece.h"
10 #include "base/threading/thread.h" 10 #include "base/threading/thread.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/browser/defaults.h" 12 #include "chrome/browser/defaults.h"
13 #include "chrome/browser/download/download_service.h" 13 #include "chrome/browser/download/download_service.h"
14 #include "chrome/browser/download/download_service_factory.h" 14 #include "chrome/browser/download/download_service_factory.h"
15 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/ui/webui/chrome_url_data_manager.h" 16 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
17 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" 17 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
18 #include "chrome/browser/ui/webui/downloads_dom_handler.h" 18 #include "chrome/browser/ui/webui/downloads_dom_handler.h"
19 #include "chrome/common/url_constants.h" 19 #include "chrome/common/url_constants.h"
20 #include "content/public/browser/download_manager.h" 20 #include "content/public/browser/download_manager.h"
21 #include "content/public/browser/web_contents.h" 21 #include "content/public/browser/web_contents.h"
22 #include "content/public/browser/web_ui.h" 22 #include "content/public/browser/web_ui.h"
23 #include "grit/browser_resources.h" 23 #include "grit/browser_resources.h"
24 #include "grit/generated_resources.h" 24 #include "grit/generated_resources.h"
25 #include "grit/theme_resources.h" 25 #include "grit/theme_resources.h"
26 #include "grit/theme_resources_standard.h" 26 #include "grit/theme_resources_standard.h"
27 #include "ui/base/layout.h"
27 #include "ui/base/resource/resource_bundle.h" 28 #include "ui/base/resource/resource_bundle.h"
28 29
29 using content::DownloadManager; 30 using content::DownloadManager;
30 using content::WebContents; 31 using content::WebContents;
31 32
32 namespace { 33 namespace {
33 34
34 ChromeWebUIDataSource* CreateDownloadsUIHTMLSource() { 35 ChromeWebUIDataSource* CreateDownloadsUIHTMLSource() {
35 ChromeWebUIDataSource* source = 36 ChromeWebUIDataSource* source =
36 new ChromeWebUIDataSource(chrome::kChromeUIDownloadsHost); 37 new ChromeWebUIDataSource(chrome::kChromeUIDownloadsHost);
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 97
97 // Set up the chrome://downloads/ source. 98 // Set up the chrome://downloads/ source.
98 ChromeWebUIDataSource* source = CreateDownloadsUIHTMLSource(); 99 ChromeWebUIDataSource* source = CreateDownloadsUIHTMLSource();
99 source->set_use_json_js_format_v2(); 100 source->set_use_json_js_format_v2();
100 ChromeURLDataManager::AddDataSource(profile, source); 101 ChromeURLDataManager::AddDataSource(profile, source);
101 } 102 }
102 103
103 // static 104 // static
104 base::RefCountedMemory* DownloadsUI::GetFaviconResourceBytes() { 105 base::RefCountedMemory* DownloadsUI::GetFaviconResourceBytes() {
105 return ResourceBundle::GetSharedInstance(). 106 return ResourceBundle::GetSharedInstance().
106 LoadDataResourceBytes(IDR_DOWNLOADS_FAVICON); 107 LoadDataResourceBytes(IDR_DOWNLOADS_FAVICON,
108 ui::SCALE_FACTOR_NONE);
107 } 109 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698