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

Side by Side Diff: chrome/browser/dom_ui/downloads_ui.cc

Issue 151131: Merge 19681 - A recent refactoring of the DOM UI had caused the download page... (Closed) Base URL: svn://chrome-svn/chrome/branches/180/src/
Patch Set: Created 11 years, 5 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
Merged /trunk/src/chrome/browser/dom_ui/downloads_ui.cc:r15898,19681
Merged /branches/chrome_webkit_merge_branch/chrome/browser/dom_ui/downloads_ui.cc:r69-2775
OLDNEW
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 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/dom_ui/downloads_ui.h" 5 #include "chrome/browser/dom_ui/downloads_ui.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "base/gfx/png_encoder.h" 8 #include "base/gfx/png_encoder.h"
9 #include "base/string_piece.h" 9 #include "base/string_piece.h"
10 #include "base/thread.h" 10 #include "base/thread.h"
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 // DownloadsUI 508 // DownloadsUI
509 // 509 //
510 /////////////////////////////////////////////////////////////////////////////// 510 ///////////////////////////////////////////////////////////////////////////////
511 511
512 DownloadsUI::DownloadsUI(TabContents* contents) : DOMUI(contents) { 512 DownloadsUI::DownloadsUI(TabContents* contents) : DOMUI(contents) {
513 DownloadManager* dlm = GetProfile()->GetDownloadManager(); 513 DownloadManager* dlm = GetProfile()->GetDownloadManager();
514 514
515 DownloadsDOMHandler* handler = new DownloadsDOMHandler(this, dlm); 515 DownloadsDOMHandler* handler = new DownloadsDOMHandler(this, dlm);
516 AddMessageHandler(handler); 516 AddMessageHandler(handler);
517 handler->Init(); 517 handler->Init();
518 handler->Init();
518 519
519 DownloadsUIHTMLSource* html_source = new DownloadsUIHTMLSource(); 520 DownloadsUIHTMLSource* html_source = new DownloadsUIHTMLSource();
520 521
521 // Set up the chrome://downloads/ source. 522 // Set up the chrome://downloads/ source.
522 g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE, 523 g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE,
523 NewRunnableMethod(&chrome_url_data_manager, 524 NewRunnableMethod(&chrome_url_data_manager,
524 &ChromeURLDataManager::AddDataSource, 525 &ChromeURLDataManager::AddDataSource,
525 html_source)); 526 html_source));
526 } 527 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698