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

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

Issue 10202025: fix downloads to use loadTimeData (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: make upload relative 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
« no previous file with comments | « chrome/browser/resources/downloads/downloads.js ('k') | no next file » | 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/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"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 88
89 DownloadsUI::DownloadsUI(content::WebUI* web_ui) : WebUIController(web_ui) { 89 DownloadsUI::DownloadsUI(content::WebUI* web_ui) : WebUIController(web_ui) {
90 Profile* profile = Profile::FromWebUI(web_ui); 90 Profile* profile = Profile::FromWebUI(web_ui);
91 DownloadManager* dlm = 91 DownloadManager* dlm =
92 DownloadServiceFactory::GetForProfile(profile)->GetDownloadManager(); 92 DownloadServiceFactory::GetForProfile(profile)->GetDownloadManager();
93 93
94 DownloadsDOMHandler* handler = new DownloadsDOMHandler(dlm); 94 DownloadsDOMHandler* handler = new DownloadsDOMHandler(dlm);
95 web_ui->AddMessageHandler(handler); 95 web_ui->AddMessageHandler(handler);
96 96
97 // Set up the chrome://downloads/ source. 97 // Set up the chrome://downloads/ source.
98 ChromeURLDataManager::AddDataSource(profile, CreateDownloadsUIHTMLSource()); 98 ChromeWebUIDataSource* source = CreateDownloadsUIHTMLSource();
99 source->set_use_json_js_format_v2();
Dan Beam 2012/04/27 18:32:39 his needs to be updated to a scoped thinger, now,
Evan Stade 2012/04/28 00:48:03 no
100 ChromeURLDataManager::AddDataSource(profile, source);
99 } 101 }
100 102
101 // static 103 // static
102 RefCountedMemory* DownloadsUI::GetFaviconResourceBytes() { 104 RefCountedMemory* DownloadsUI::GetFaviconResourceBytes() {
103 return ResourceBundle::GetSharedInstance(). 105 return ResourceBundle::GetSharedInstance().
104 LoadDataResourceBytes(IDR_DOWNLOADS_FAVICON); 106 LoadDataResourceBytes(IDR_DOWNLOADS_FAVICON);
105 } 107 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/downloads/downloads.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698