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

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

Issue 12049052: Move core url data manager classes to content. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: review comments Created 7 years, 11 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/DEPS ('k') | content/browser/browser_plugin/browser_plugin_host_browsertest.cc » ('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"
(...skipping 13 matching lines...) Expand all
24 #include "content/browser/gpu/gpu_process_host_ui_shim.h" 24 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
25 #include "content/browser/histogram_synchronizer.h" 25 #include "content/browser/histogram_synchronizer.h"
26 #include "content/browser/in_process_webkit/webkit_thread.h" 26 #include "content/browser/in_process_webkit/webkit_thread.h"
27 #include "content/browser/loader/resource_dispatcher_host_impl.h" 27 #include "content/browser/loader/resource_dispatcher_host_impl.h"
28 #include "content/browser/net/browser_online_state_observer.h" 28 #include "content/browser/net/browser_online_state_observer.h"
29 #include "content/browser/plugin_service_impl.h" 29 #include "content/browser/plugin_service_impl.h"
30 #include "content/browser/renderer_host/media/audio_mirroring_manager.h" 30 #include "content/browser/renderer_host/media/audio_mirroring_manager.h"
31 #include "content/browser/renderer_host/media/media_stream_manager.h" 31 #include "content/browser/renderer_host/media/media_stream_manager.h"
32 #include "content/browser/speech/speech_recognition_manager_impl.h" 32 #include "content/browser/speech/speech_recognition_manager_impl.h"
33 #include "content/browser/trace_controller_impl.h" 33 #include "content/browser/trace_controller_impl.h"
34 #include "content/browser/webui/url_data_manager.h"
34 #include "content/public/browser/browser_main_parts.h" 35 #include "content/public/browser/browser_main_parts.h"
35 #include "content/public/browser/browser_shutdown.h" 36 #include "content/public/browser/browser_shutdown.h"
36 #include "content/public/browser/compositor_util.h" 37 #include "content/public/browser/compositor_util.h"
37 #include "content/public/browser/content_browser_client.h" 38 #include "content/public/browser/content_browser_client.h"
38 #include "content/public/browser/render_process_host.h" 39 #include "content/public/browser/render_process_host.h"
39 #include "content/public/common/content_switches.h" 40 #include "content/public/common/content_switches.h"
40 #include "content/public/common/main_function_params.h" 41 #include "content/public/common/main_function_params.h"
41 #include "content/public/common/result_codes.h" 42 #include "content/public/common/result_codes.h"
42 #include "crypto/nss_util.h" 43 #include "crypto/nss_util.h"
43 #include "media/audio/audio_manager.h" 44 #include "media/audio/audio_manager.h"
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after
612 BrowserThreadImpl::ShutdownThreadPool(); 613 BrowserThreadImpl::ShutdownThreadPool();
613 614
614 #if !defined(OS_IOS) 615 #if !defined(OS_IOS)
615 // Must happen after the IO thread is shutdown since this may be accessed from 616 // Must happen after the IO thread is shutdown since this may be accessed from
616 // it. 617 // it.
617 BrowserGpuChannelHostFactory::Terminate(); 618 BrowserGpuChannelHostFactory::Terminate();
618 619
619 // Must happen after the I/O thread is shutdown since this class lives on the 620 // Must happen after the I/O thread is shutdown since this class lives on the
620 // I/O thread and isn't threadsafe. 621 // I/O thread and isn't threadsafe.
621 GamepadService::GetInstance()->Terminate(); 622 GamepadService::GetInstance()->Terminate();
623
624 ChromeURLDataManager::DeleteDataSources();
622 #endif // !defined(OS_IOS) 625 #endif // !defined(OS_IOS)
623 626
624 if (parts_.get()) 627 if (parts_.get())
625 parts_->PostDestroyThreads(); 628 parts_->PostDestroyThreads();
626 } 629 }
627 630
628 void BrowserMainLoop::InitializeMainThread() { 631 void BrowserMainLoop::InitializeMainThread() {
629 const char* kThreadName = "CrBrowserMain"; 632 const char* kThreadName = "CrBrowserMain";
630 base::PlatformThread::SetName(kThreadName); 633 base::PlatformThread::SetName(kThreadName);
631 if (main_message_loop_.get()) 634 if (main_message_loop_.get())
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
770 DCHECK_EQ(MessageLoop::TYPE_UI, MessageLoop::current()->type()); 773 DCHECK_EQ(MessageLoop::TYPE_UI, MessageLoop::current()->type());
771 if (parameters_.ui_task) 774 if (parameters_.ui_task)
772 MessageLoopForUI::current()->PostTask(FROM_HERE, *parameters_.ui_task); 775 MessageLoopForUI::current()->PostTask(FROM_HERE, *parameters_.ui_task);
773 776
774 base::RunLoop run_loop; 777 base::RunLoop run_loop;
775 run_loop.Run(); 778 run_loop.Run();
776 #endif 779 #endif
777 } 780 }
778 781
779 } // namespace content 782 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/DEPS ('k') | content/browser/browser_plugin/browser_plugin_host_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698