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

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

Issue 2460723003: Enable connection to Mojo services from Blink (Closed)
Patch Set: Rebase 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"
96 #include "media/base/media.h" 95 #include "media/base/media.h"
97 #include "media/base/user_input_monitor.h" 96 #include "media/base/user_input_monitor.h"
98 #include "media/midi/midi_service.h" 97 #include "media/midi/midi_service.h"
99 #include "mojo/edk/embedder/embedder.h" 98 #include "mojo/edk/embedder/embedder.h"
100 #include "mojo/edk/embedder/scoped_ipc_support.h" 99 #include "mojo/edk/embedder/scoped_ipc_support.h"
101 #include "net/base/network_change_notifier.h" 100 #include "net/base/network_change_notifier.h"
102 #include "net/socket/client_socket_factory.h" 101 #include "net/socket/client_socket_factory.h"
103 #include "net/ssl/ssl_config_service.h" 102 #include "net/ssl/ssl_config_service.h"
104 #include "ppapi/features/features.h" 103 #include "ppapi/features/features.h"
105 #include "services/service_manager/runner/common/client_util.h" 104 #include "services/service_manager/runner/common/client_util.h"
(...skipping 1427 matching lines...) Expand 10 before | Expand all | Expand 10 after
1533 { 1532 {
1534 TRACE_EVENT0( 1533 TRACE_EVENT0(
1535 "startup", 1534 "startup",
1536 "BrowserMainLoop::BrowserThreadsStarted::InitUserInputMonitor"); 1535 "BrowserMainLoop::BrowserThreadsStarted::InitUserInputMonitor");
1537 user_input_monitor_ = media::UserInputMonitor::Create( 1536 user_input_monitor_ = media::UserInputMonitor::Create(
1538 io_thread_->task_runner(), main_thread_->task_runner()); 1537 io_thread_->task_runner(), main_thread_->task_runner());
1539 } 1538 }
1540 1539
1541 { 1540 {
1542 TRACE_EVENT0("startup", 1541 TRACE_EVENT0("startup",
1543 "BrowserMainLoop::BrowserThreadsStarted::TimeZoneMonitor");
1544 time_zone_monitor_ =
1545 device::TimeZoneMonitor::Create(file_thread_->task_runner());
1546 }
1547
1548 {
1549 TRACE_EVENT0("startup",
1550 "BrowserMainLoop::BrowserThreadsStarted::SaveFileManager"); 1542 "BrowserMainLoop::BrowserThreadsStarted::SaveFileManager");
1551 save_file_manager_ = new SaveFileManager(); 1543 save_file_manager_ = new SaveFileManager();
1552 } 1544 }
1553 1545
1554 // Alert the clipboard class to which threads are allowed to access the 1546 // Alert the clipboard class to which threads are allowed to access the
1555 // clipboard: 1547 // clipboard:
1556 std::vector<base::PlatformThreadId> allowed_clipboard_threads; 1548 std::vector<base::PlatformThreadId> allowed_clipboard_threads;
1557 // The current thread is the UI thread. 1549 // The current thread is the UI thread.
1558 allowed_clipboard_threads.push_back(base::PlatformThread::CurrentId()); 1550 allowed_clipboard_threads.push_back(base::PlatformThread::CurrentId());
1559 #if defined(OS_WIN) 1551 #if defined(OS_WIN)
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
1788 if (!audio_manager_) { 1780 if (!audio_manager_) {
1789 audio_thread_ = base::MakeUnique<AudioManagerThread>(); 1781 audio_thread_ = base::MakeUnique<AudioManagerThread>();
1790 audio_manager_ = media::AudioManager::Create( 1782 audio_manager_ = media::AudioManager::Create(
1791 audio_thread_->task_runner(), audio_thread_->worker_task_runner(), 1783 audio_thread_->task_runner(), audio_thread_->worker_task_runner(),
1792 MediaInternals::GetInstance()); 1784 MediaInternals::GetInstance());
1793 } 1785 }
1794 CHECK(audio_manager_); 1786 CHECK(audio_manager_);
1795 } 1787 }
1796 1788
1797 } // namespace content 1789 } // 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