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

Side by Side Diff: content/browser/browser_main_loop.cc

Issue 10799005: Replace the DownloadFileManager with direct ownership (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merged to LKGR. Created 8 years, 4 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 | « content/browser/browser_context.cc ('k') | content/browser/download/base_file.h » ('j') | 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 "content/browser/browser_main_loop.h" 5 #include "content/browser/browser_main_loop.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/hi_res_timer_manager.h" 10 #include "base/hi_res_timer_manager.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/message_loop.h" 12 #include "base/message_loop.h"
13 #include "base/metrics/field_trial.h" 13 #include "base/metrics/field_trial.h"
14 #include "base/metrics/histogram.h" 14 #include "base/metrics/histogram.h"
15 #include "base/run_loop.h" 15 #include "base/run_loop.h"
16 #include "base/string_number_conversions.h" 16 #include "base/string_number_conversions.h"
17 #include "base/threading/thread_restrictions.h" 17 #include "base/threading/thread_restrictions.h"
18 #include "content/browser/browser_thread_impl.h" 18 #include "content/browser/browser_thread_impl.h"
19 #include "content/browser/download/download_file_manager.h"
20 #include "content/browser/download/save_file_manager.h" 19 #include "content/browser/download/save_file_manager.h"
21 #include "content/browser/gamepad/gamepad_service.h" 20 #include "content/browser/gamepad/gamepad_service.h"
22 #include "content/browser/gpu/browser_gpu_channel_host_factory.h" 21 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
23 #include "content/browser/gpu/gpu_process_host.h" 22 #include "content/browser/gpu/gpu_process_host.h"
24 #include "content/browser/gpu/gpu_process_host_ui_shim.h" 23 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
25 #include "content/browser/histogram_synchronizer.h" 24 #include "content/browser/histogram_synchronizer.h"
26 #include "content/browser/in_process_webkit/webkit_thread.h" 25 #include "content/browser/in_process_webkit/webkit_thread.h"
27 #include "content/browser/net/browser_online_state_observer.h" 26 #include "content/browser/net/browser_online_state_observer.h"
28 #include "content/browser/plugin_service_impl.h" 27 #include "content/browser/plugin_service_impl.h"
29 #include "content/browser/renderer_host/media/audio_input_device_manager.h" 28 #include "content/browser/renderer_host/media/audio_input_device_manager.h"
(...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 resource_dispatcher_host_.reset(); 545 resource_dispatcher_host_.reset();
547 break; 546 break;
548 case BrowserThread::FILE_USER_BLOCKING: 547 case BrowserThread::FILE_USER_BLOCKING:
549 thread_to_stop = &file_user_blocking_thread_; 548 thread_to_stop = &file_user_blocking_thread_;
550 break; 549 break;
551 case BrowserThread::FILE: 550 case BrowserThread::FILE:
552 thread_to_stop = &file_thread_; 551 thread_to_stop = &file_thread_;
553 552
554 // Clean up state that lives on or uses the file_thread_ before 553 // Clean up state that lives on or uses the file_thread_ before
555 // it goes away. 554 // it goes away.
556 if (resource_dispatcher_host_.get()) { 555 if (resource_dispatcher_host_.get())
557 resource_dispatcher_host_.get()->download_file_manager()->Shutdown();
558 resource_dispatcher_host_.get()->save_file_manager()->Shutdown(); 556 resource_dispatcher_host_.get()->save_file_manager()->Shutdown();
559 }
560 break; 557 break;
561 case BrowserThread::PROCESS_LAUNCHER: 558 case BrowserThread::PROCESS_LAUNCHER:
562 thread_to_stop = &process_launcher_thread_; 559 thread_to_stop = &process_launcher_thread_;
563 break; 560 break;
564 case BrowserThread::CACHE: 561 case BrowserThread::CACHE:
565 thread_to_stop = &cache_thread_; 562 thread_to_stop = &cache_thread_;
566 break; 563 break;
567 case BrowserThread::IO: 564 case BrowserThread::IO:
568 thread_to_stop = &io_thread_; 565 thread_to_stop = &io_thread_;
569 break; 566 break;
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
681 DCHECK_EQ(MessageLoop::TYPE_UI, MessageLoop::current()->type()); 678 DCHECK_EQ(MessageLoop::TYPE_UI, MessageLoop::current()->type());
682 if (parameters_.ui_task) 679 if (parameters_.ui_task)
683 MessageLoopForUI::current()->PostTask(FROM_HERE, *parameters_.ui_task); 680 MessageLoopForUI::current()->PostTask(FROM_HERE, *parameters_.ui_task);
684 681
685 base::RunLoop run_loop; 682 base::RunLoop run_loop;
686 run_loop.Run(); 683 run_loop.Run();
687 #endif 684 #endif
688 } 685 }
689 686
690 } // namespace content 687 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/browser_context.cc ('k') | content/browser/download/base_file.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698