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

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

Issue 2589493006: Revert of Enable connection to Mojo services from Blink (Closed)
Patch Set: Created 4 years 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
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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 #include "content/public/browser/gpu_data_manager_observer.h" 85 #include "content/public/browser/gpu_data_manager_observer.h"
86 #include "content/public/browser/render_process_host.h" 86 #include "content/public/browser/render_process_host.h"
87 #include "content/public/browser/tracing_controller.h" 87 #include "content/public/browser/tracing_controller.h"
88 #include "content/public/common/content_client.h" 88 #include "content/public/common/content_client.h"
89 #include "content/public/common/content_features.h" 89 #include "content/public/common/content_features.h"
90 #include "content/public/common/content_switches.h" 90 #include "content/public/common/content_switches.h"
91 #include "content/public/common/main_function_params.h" 91 #include "content/public/common/main_function_params.h"
92 #include "content/public/common/result_codes.h" 92 #include "content/public/common/result_codes.h"
93 #include "device/battery/battery_status_service.h" 93 #include "device/battery/battery_status_service.h"
94 #include "device/gamepad/gamepad_service.h" 94 #include "device/gamepad/gamepad_service.h"
95 #include "device/time_zone_monitor/time_zone_monitor.h"
95 #include "media/base/media.h" 96 #include "media/base/media.h"
96 #include "media/base/user_input_monitor.h" 97 #include "media/base/user_input_monitor.h"
97 #include "media/midi/midi_service.h" 98 #include "media/midi/midi_service.h"
98 #include "mojo/edk/embedder/embedder.h" 99 #include "mojo/edk/embedder/embedder.h"
99 #include "mojo/edk/embedder/scoped_ipc_support.h" 100 #include "mojo/edk/embedder/scoped_ipc_support.h"
100 #include "net/base/network_change_notifier.h" 101 #include "net/base/network_change_notifier.h"
101 #include "net/socket/client_socket_factory.h" 102 #include "net/socket/client_socket_factory.h"
102 #include "net/ssl/ssl_config_service.h" 103 #include "net/ssl/ssl_config_service.h"
103 #include "ppapi/features/features.h" 104 #include "ppapi/features/features.h"
104 #include "services/service_manager/runner/common/client_util.h" 105 #include "services/service_manager/runner/common/client_util.h"
(...skipping 1432 matching lines...) Expand 10 before | Expand all | Expand 10 after
1537 { 1538 {
1538 TRACE_EVENT0( 1539 TRACE_EVENT0(
1539 "startup", 1540 "startup",
1540 "BrowserMainLoop::BrowserThreadsStarted::InitUserInputMonitor"); 1541 "BrowserMainLoop::BrowserThreadsStarted::InitUserInputMonitor");
1541 user_input_monitor_ = media::UserInputMonitor::Create( 1542 user_input_monitor_ = media::UserInputMonitor::Create(
1542 io_thread_->task_runner(), main_thread_->task_runner()); 1543 io_thread_->task_runner(), main_thread_->task_runner());
1543 } 1544 }
1544 1545
1545 { 1546 {
1546 TRACE_EVENT0("startup", 1547 TRACE_EVENT0("startup",
1548 "BrowserMainLoop::BrowserThreadsStarted::TimeZoneMonitor");
1549 time_zone_monitor_ =
1550 device::TimeZoneMonitor::Create(file_thread_->task_runner());
1551 }
1552
1553 {
1554 TRACE_EVENT0("startup",
1547 "BrowserMainLoop::BrowserThreadsStarted::SaveFileManager"); 1555 "BrowserMainLoop::BrowserThreadsStarted::SaveFileManager");
1548 save_file_manager_ = new SaveFileManager(); 1556 save_file_manager_ = new SaveFileManager();
1549 } 1557 }
1550 1558
1551 // Alert the clipboard class to which threads are allowed to access the 1559 // Alert the clipboard class to which threads are allowed to access the
1552 // clipboard: 1560 // clipboard:
1553 std::vector<base::PlatformThreadId> allowed_clipboard_threads; 1561 std::vector<base::PlatformThreadId> allowed_clipboard_threads;
1554 // The current thread is the UI thread. 1562 // The current thread is the UI thread.
1555 allowed_clipboard_threads.push_back(base::PlatformThread::CurrentId()); 1563 allowed_clipboard_threads.push_back(base::PlatformThread::CurrentId());
1556 #if defined(OS_WIN) 1564 #if defined(OS_WIN)
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
1785 if (!audio_manager_) { 1793 if (!audio_manager_) {
1786 audio_thread_ = base::MakeUnique<AudioManagerThread>(); 1794 audio_thread_ = base::MakeUnique<AudioManagerThread>();
1787 audio_manager_ = media::AudioManager::Create( 1795 audio_manager_ = media::AudioManager::Create(
1788 audio_thread_->task_runner(), audio_thread_->worker_task_runner(), 1796 audio_thread_->task_runner(), audio_thread_->worker_task_runner(),
1789 MediaInternals::GetInstance()); 1797 MediaInternals::GetInstance());
1790 } 1798 }
1791 CHECK(audio_manager_); 1799 CHECK(audio_manager_);
1792 } 1800 }
1793 1801
1794 } // namespace content 1802 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/browser_main_loop.h ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698