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

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: 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 | « chrome/chrome_tests_unit.gypi ('k') | content/browser/resource_context_impl.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 "chrome/browser/ui/webui/chrome_url_data_manager.h"
18 #include "content/browser/browser_thread_impl.h" 19 #include "content/browser/browser_thread_impl.h"
19 #include "content/browser/download/save_file_manager.h" 20 #include "content/browser/download/save_file_manager.h"
20 #include "content/browser/gamepad/gamepad_service.h" 21 #include "content/browser/gamepad/gamepad_service.h"
21 #include "content/browser/gpu/browser_gpu_channel_host_factory.h" 22 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
22 #include "content/browser/gpu/gpu_data_manager_impl.h" 23 #include "content/browser/gpu/gpu_data_manager_impl.h"
23 #include "content/browser/gpu/gpu_process_host.h" 24 #include "content/browser/gpu/gpu_process_host.h"
24 #include "content/browser/gpu/gpu_process_host_ui_shim.h" 25 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
25 #include "content/browser/histogram_synchronizer.h" 26 #include "content/browser/histogram_synchronizer.h"
26 #include "content/browser/in_process_webkit/webkit_thread.h" 27 #include "content/browser/in_process_webkit/webkit_thread.h"
27 #include "content/browser/loader/resource_dispatcher_host_impl.h" 28 #include "content/browser/loader/resource_dispatcher_host_impl.h"
(...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after
612 #if !defined(OS_IOS) 613 #if !defined(OS_IOS)
613 // Must happen after the IO thread is shutdown since this may be accessed from 614 // Must happen after the IO thread is shutdown since this may be accessed from
614 // it. 615 // it.
615 BrowserGpuChannelHostFactory::Terminate(); 616 BrowserGpuChannelHostFactory::Terminate();
616 617
617 // Must happen after the I/O thread is shutdown since this class lives on the 618 // Must happen after the I/O thread is shutdown since this class lives on the
618 // I/O thread and isn't threadsafe. 619 // I/O thread and isn't threadsafe.
619 GamepadService::GetInstance()->Terminate(); 620 GamepadService::GetInstance()->Terminate();
620 #endif // !defined(OS_IOS) 621 #endif // !defined(OS_IOS)
621 622
623 ChromeURLDataManager::DeleteDataSources();
scottmg 2013/01/24 00:22:07 I think this happened after PostDestroyThreads pre
624
622 if (parts_.get()) 625 if (parts_.get())
623 parts_->PostDestroyThreads(); 626 parts_->PostDestroyThreads();
624 } 627 }
625 628
626 void BrowserMainLoop::InitializeMainThread() { 629 void BrowserMainLoop::InitializeMainThread() {
627 const char* kThreadName = "CrBrowserMain"; 630 const char* kThreadName = "CrBrowserMain";
628 base::PlatformThread::SetName(kThreadName); 631 base::PlatformThread::SetName(kThreadName);
629 if (main_message_loop_.get()) 632 if (main_message_loop_.get())
630 main_message_loop_->set_thread_name(kThreadName); 633 main_message_loop_->set_thread_name(kThreadName);
631 634
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
743 DCHECK_EQ(MessageLoop::TYPE_UI, MessageLoop::current()->type()); 746 DCHECK_EQ(MessageLoop::TYPE_UI, MessageLoop::current()->type());
744 if (parameters_.ui_task) 747 if (parameters_.ui_task)
745 MessageLoopForUI::current()->PostTask(FROM_HERE, *parameters_.ui_task); 748 MessageLoopForUI::current()->PostTask(FROM_HERE, *parameters_.ui_task);
746 749
747 base::RunLoop run_loop; 750 base::RunLoop run_loop;
748 run_loop.Run(); 751 run_loop.Run();
749 #endif 752 #endif
750 } 753 }
751 754
752 } // namespace content 755 } // namespace content
OLDNEW
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | content/browser/resource_context_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698