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

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

Issue 2460723003: Enable connection to Mojo services from Blink (Closed)
Patch Set: Self-review 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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 #include "content/public/browser/content_browser_client.h" 77 #include "content/public/browser/content_browser_client.h"
78 #include "content/public/browser/gpu_data_manager_observer.h" 78 #include "content/public/browser/gpu_data_manager_observer.h"
79 #include "content/public/browser/render_process_host.h" 79 #include "content/public/browser/render_process_host.h"
80 #include "content/public/browser/tracing_controller.h" 80 #include "content/public/browser/tracing_controller.h"
81 #include "content/public/common/content_client.h" 81 #include "content/public/common/content_client.h"
82 #include "content/public/common/content_features.h" 82 #include "content/public/common/content_features.h"
83 #include "content/public/common/content_switches.h" 83 #include "content/public/common/content_switches.h"
84 #include "content/public/common/main_function_params.h" 84 #include "content/public/common/main_function_params.h"
85 #include "content/public/common/result_codes.h" 85 #include "content/public/common/result_codes.h"
86 #include "device/battery/battery_status_service.h" 86 #include "device/battery/battery_status_service.h"
87 #include "device/time_zone_monitor/time_zone_monitor.h"
88 #include "media/base/media.h" 87 #include "media/base/media.h"
89 #include "media/base/user_input_monitor.h" 88 #include "media/base/user_input_monitor.h"
90 #include "media/midi/midi_manager.h" 89 #include "media/midi/midi_manager.h"
91 #include "mojo/edk/embedder/embedder.h" 90 #include "mojo/edk/embedder/embedder.h"
92 #include "mojo/edk/embedder/scoped_ipc_support.h" 91 #include "mojo/edk/embedder/scoped_ipc_support.h"
93 #include "net/base/network_change_notifier.h" 92 #include "net/base/network_change_notifier.h"
94 #include "net/socket/client_socket_factory.h" 93 #include "net/socket/client_socket_factory.h"
95 #include "net/ssl/ssl_config_service.h" 94 #include "net/ssl/ssl_config_service.h"
96 #include "ppapi/features/features.h" 95 #include "ppapi/features/features.h"
97 #include "services/service_manager/runner/common/client_util.h" 96 #include "services/service_manager/runner/common/client_util.h"
(...skipping 1259 matching lines...) Expand 10 before | Expand all | Expand 10 after
1357 { 1356 {
1358 TRACE_EVENT0( 1357 TRACE_EVENT0(
1359 "startup", 1358 "startup",
1360 "BrowserMainLoop::BrowserThreadsStarted::InitUserInputMonitor"); 1359 "BrowserMainLoop::BrowserThreadsStarted::InitUserInputMonitor");
1361 user_input_monitor_ = media::UserInputMonitor::Create( 1360 user_input_monitor_ = media::UserInputMonitor::Create(
1362 io_thread_->task_runner(), main_thread_->task_runner()); 1361 io_thread_->task_runner(), main_thread_->task_runner());
1363 } 1362 }
1364 1363
1365 { 1364 {
1366 TRACE_EVENT0("startup", 1365 TRACE_EVENT0("startup",
1367 "BrowserMainLoop::BrowserThreadsStarted::TimeZoneMonitor");
1368 time_zone_monitor_ =
1369 device::TimeZoneMonitor::Create(file_thread_->task_runner());
1370 }
1371
1372 {
1373 TRACE_EVENT0("startup",
1374 "BrowserMainLoop::BrowserThreadsStarted::SaveFileManager"); 1366 "BrowserMainLoop::BrowserThreadsStarted::SaveFileManager");
1375 save_file_manager_ = new SaveFileManager(); 1367 save_file_manager_ = new SaveFileManager();
1376 } 1368 }
1377 1369
1378 // Alert the clipboard class to which threads are allowed to access the 1370 // Alert the clipboard class to which threads are allowed to access the
1379 // clipboard: 1371 // clipboard:
1380 std::vector<base::PlatformThreadId> allowed_clipboard_threads; 1372 std::vector<base::PlatformThreadId> allowed_clipboard_threads;
1381 // The current thread is the UI thread. 1373 // The current thread is the UI thread.
1382 allowed_clipboard_threads.push_back(base::PlatformThread::CurrentId()); 1374 allowed_clipboard_threads.push_back(base::PlatformThread::CurrentId());
1383 #if defined(OS_WIN) 1375 #if defined(OS_WIN)
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
1626 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = 1618 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner =
1627 audio_thread_->task_runner(); 1619 audio_thread_->task_runner();
1628 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), 1620 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner),
1629 std::move(worker_task_runner), 1621 std::move(worker_task_runner),
1630 MediaInternals::GetInstance()); 1622 MediaInternals::GetInstance());
1631 } 1623 }
1632 CHECK(audio_manager_); 1624 CHECK(audio_manager_);
1633 } 1625 }
1634 1626
1635 } // namespace content 1627 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698