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

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

Issue 2460723003: Enable connection to Mojo services from Blink (Closed)
Patch Set: Response to reviews 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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 #include "content/public/browser/gpu_data_manager_observer.h" 83 #include "content/public/browser/gpu_data_manager_observer.h"
84 #include "content/public/browser/render_process_host.h" 84 #include "content/public/browser/render_process_host.h"
85 #include "content/public/browser/tracing_controller.h" 85 #include "content/public/browser/tracing_controller.h"
86 #include "content/public/common/content_client.h" 86 #include "content/public/common/content_client.h"
87 #include "content/public/common/content_features.h" 87 #include "content/public/common/content_features.h"
88 #include "content/public/common/content_switches.h" 88 #include "content/public/common/content_switches.h"
89 #include "content/public/common/main_function_params.h" 89 #include "content/public/common/main_function_params.h"
90 #include "content/public/common/result_codes.h" 90 #include "content/public/common/result_codes.h"
91 #include "device/battery/battery_status_service.h" 91 #include "device/battery/battery_status_service.h"
92 #include "device/gamepad/gamepad_service.h" 92 #include "device/gamepad/gamepad_service.h"
93 #include "device/time_zone_monitor/time_zone_monitor.h"
94 #include "media/base/media.h" 93 #include "media/base/media.h"
95 #include "media/base/user_input_monitor.h" 94 #include "media/base/user_input_monitor.h"
96 #include "media/midi/midi_service.h" 95 #include "media/midi/midi_service.h"
97 #include "mojo/edk/embedder/embedder.h" 96 #include "mojo/edk/embedder/embedder.h"
98 #include "mojo/edk/embedder/scoped_ipc_support.h" 97 #include "mojo/edk/embedder/scoped_ipc_support.h"
99 #include "net/base/network_change_notifier.h" 98 #include "net/base/network_change_notifier.h"
100 #include "net/socket/client_socket_factory.h" 99 #include "net/socket/client_socket_factory.h"
101 #include "net/ssl/ssl_config_service.h" 100 #include "net/ssl/ssl_config_service.h"
102 #include "ppapi/features/features.h" 101 #include "ppapi/features/features.h"
103 #include "services/service_manager/runner/common/client_util.h" 102 #include "services/service_manager/runner/common/client_util.h"
(...skipping 1348 matching lines...) Expand 10 before | Expand all | Expand 10 after
1452 { 1451 {
1453 TRACE_EVENT0( 1452 TRACE_EVENT0(
1454 "startup", 1453 "startup",
1455 "BrowserMainLoop::BrowserThreadsStarted::InitUserInputMonitor"); 1454 "BrowserMainLoop::BrowserThreadsStarted::InitUserInputMonitor");
1456 user_input_monitor_ = media::UserInputMonitor::Create( 1455 user_input_monitor_ = media::UserInputMonitor::Create(
1457 io_thread_->task_runner(), main_thread_->task_runner()); 1456 io_thread_->task_runner(), main_thread_->task_runner());
1458 } 1457 }
1459 1458
1460 { 1459 {
1461 TRACE_EVENT0("startup", 1460 TRACE_EVENT0("startup",
1462 "BrowserMainLoop::BrowserThreadsStarted::TimeZoneMonitor");
1463 time_zone_monitor_ =
1464 device::TimeZoneMonitor::Create(file_thread_->task_runner());
1465 }
1466
1467 {
1468 TRACE_EVENT0("startup",
1469 "BrowserMainLoop::BrowserThreadsStarted::SaveFileManager"); 1461 "BrowserMainLoop::BrowserThreadsStarted::SaveFileManager");
1470 save_file_manager_ = new SaveFileManager(); 1462 save_file_manager_ = new SaveFileManager();
1471 } 1463 }
1472 1464
1473 // Alert the clipboard class to which threads are allowed to access the 1465 // Alert the clipboard class to which threads are allowed to access the
1474 // clipboard: 1466 // clipboard:
1475 std::vector<base::PlatformThreadId> allowed_clipboard_threads; 1467 std::vector<base::PlatformThreadId> allowed_clipboard_threads;
1476 // The current thread is the UI thread. 1468 // The current thread is the UI thread.
1477 allowed_clipboard_threads.push_back(base::PlatformThread::CurrentId()); 1469 allowed_clipboard_threads.push_back(base::PlatformThread::CurrentId());
1478 #if defined(OS_WIN) 1470 #if defined(OS_WIN)
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
1707 if (!audio_manager_) { 1699 if (!audio_manager_) {
1708 audio_thread_ = base::MakeUnique<AudioManagerThread>(); 1700 audio_thread_ = base::MakeUnique<AudioManagerThread>();
1709 audio_manager_ = media::AudioManager::Create( 1701 audio_manager_ = media::AudioManager::Create(
1710 audio_thread_->task_runner(), audio_thread_->worker_task_runner(), 1702 audio_thread_->task_runner(), audio_thread_->worker_task_runner(),
1711 MediaInternals::GetInstance()); 1703 MediaInternals::GetInstance());
1712 } 1704 }
1713 CHECK(audio_manager_); 1705 CHECK(audio_manager_);
1714 } 1706 }
1715 1707
1716 } // namespace content 1708 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698