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

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

Issue 1461243002: [OLD ATTEMPT, DO NOT REVIEW] mustash: Enable connections to mus from the Chrome renderer Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed Ben's comments Created 5 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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/feature_list.h" 9 #include "base/feature_list.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 27 matching lines...) Expand all
38 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h" 38 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
39 #include "content/browser/gpu/compositor_util.h" 39 #include "content/browser/gpu/compositor_util.h"
40 #include "content/browser/gpu/gpu_data_manager_impl.h" 40 #include "content/browser/gpu/gpu_data_manager_impl.h"
41 #include "content/browser/gpu/gpu_process_host.h" 41 #include "content/browser/gpu/gpu_process_host.h"
42 #include "content/browser/gpu/gpu_process_host_ui_shim.h" 42 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
43 #include "content/browser/histogram_synchronizer.h" 43 #include "content/browser/histogram_synchronizer.h"
44 #include "content/browser/loader/resource_dispatcher_host_impl.h" 44 #include "content/browser/loader/resource_dispatcher_host_impl.h"
45 #include "content/browser/media/media_internals.h" 45 #include "content/browser/media/media_internals.h"
46 #include "content/browser/mojo/mojo_shell_context.h" 46 #include "content/browser/mojo/mojo_shell_context.h"
47 #include "content/browser/net/browser_online_state_observer.h" 47 #include "content/browser/net/browser_online_state_observer.h"
48 #include "content/browser/render_process_connection_listener.h"
48 #include "content/browser/renderer_host/media/media_stream_manager.h" 49 #include "content/browser/renderer_host/media/media_stream_manager.h"
49 #include "content/browser/speech/speech_recognition_manager_impl.h" 50 #include "content/browser/speech/speech_recognition_manager_impl.h"
50 #include "content/browser/startup_task_runner.h" 51 #include "content/browser/startup_task_runner.h"
51 #include "content/browser/time_zone_monitor.h" 52 #include "content/browser/time_zone_monitor.h"
52 #include "content/browser/webui/content_web_ui_controller_factory.h" 53 #include "content/browser/webui/content_web_ui_controller_factory.h"
53 #include "content/browser/webui/url_data_manager.h" 54 #include "content/browser/webui/url_data_manager.h"
54 #include "content/common/content_switches_internal.h" 55 #include "content/common/content_switches_internal.h"
55 #include "content/common/host_discardable_shared_memory_manager.h" 56 #include "content/common/host_discardable_shared_memory_manager.h"
56 #include "content/common/host_shared_bitmap_manager.h" 57 #include "content/common/host_shared_bitmap_manager.h"
57 #include "content/public/browser/browser_main_parts.h" 58 #include "content/public/browser/browser_main_parts.h"
(...skipping 871 matching lines...) Expand 10 before | Expand all | Expand 10 after
929 return result_code_; 930 return result_code_;
930 } 931 }
931 932
932 int BrowserMainLoop::PreMainMessageLoopRun() { 933 int BrowserMainLoop::PreMainMessageLoopRun() {
933 #if defined(MOJO_SHELL_CLIENT) 934 #if defined(MOJO_SHELL_CLIENT)
934 if (IsRunningInMojoShell()) { 935 if (IsRunningInMojoShell()) {
935 MojoShellConnectionImpl::Create(); 936 MojoShellConnectionImpl::Create();
936 #if defined(USE_AURA) 937 #if defined(USE_AURA)
937 views::WindowManagerConnection::Create( 938 views::WindowManagerConnection::Create(
938 MojoShellConnection::Get()->GetApplication()); 939 MojoShellConnection::Get()->GetApplication());
940 CreateRenderProcessConnectionListener();
939 #endif 941 #endif
940 } 942 }
941 #endif 943 #endif
942 944
943 if (parts_) { 945 if (parts_) {
944 TRACE_EVENT0("startup", 946 TRACE_EVENT0("startup",
945 "BrowserMainLoop::CreateThreads:PreMainMessageLoopRun"); 947 "BrowserMainLoop::CreateThreads:PreMainMessageLoopRun");
946 TRACK_SCOPED_REGION( 948 TRACK_SCOPED_REGION(
947 "Startup", "BrowserMainLoop::PreMainMessageLoopRun"); 949 "Startup", "BrowserMainLoop::PreMainMessageLoopRun");
948 950
(...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after
1476 DCHECK(is_tracing_startup_for_duration_); 1478 DCHECK(is_tracing_startup_for_duration_);
1477 1479
1478 is_tracing_startup_for_duration_ = false; 1480 is_tracing_startup_for_duration_ = false;
1479 TracingController::GetInstance()->StopTracing( 1481 TracingController::GetInstance()->StopTracing(
1480 TracingController::CreateFileSink( 1482 TracingController::CreateFileSink(
1481 startup_trace_file_, 1483 startup_trace_file_,
1482 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); 1484 base::Bind(OnStoppedStartupTracing, startup_trace_file_)));
1483 } 1485 }
1484 1486
1485 } // namespace content 1487 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698