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

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

Issue 1476643002: mustash: Enable connections to mus from the Chrome renderer [take 2] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Don't create a RenderWidgetWindowTreeeClientFactory in tests 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 915 matching lines...) Expand 10 before | Expand all | Expand 10 after
926 TRACE_EVENT_END0("startup", "BrowserMainLoop::CreateThreads:start"); 926 TRACE_EVENT_END0("startup", "BrowserMainLoop::CreateThreads:start");
927 } 927 }
928 created_threads_ = true; 928 created_threads_ = true;
929 return result_code_; 929 return result_code_;
930 } 930 }
931 931
932 int BrowserMainLoop::PreMainMessageLoopRun() { 932 int BrowserMainLoop::PreMainMessageLoopRun() {
933 #if defined(MOJO_SHELL_CLIENT) 933 #if defined(MOJO_SHELL_CLIENT)
934 if (IsRunningInMojoShell()) { 934 if (IsRunningInMojoShell()) {
935 MojoShellConnectionImpl::Create(); 935 MojoShellConnectionImpl::Create();
936 MojoShellConnectionImpl::Get()->BindToCommandLinePlatformChannel();
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());
939 #endif 940 #endif
940 } 941 }
941 #endif 942 #endif
942 943
943 if (parts_) { 944 if (parts_) {
944 TRACE_EVENT0("startup", 945 TRACE_EVENT0("startup",
945 "BrowserMainLoop::CreateThreads:PreMainMessageLoopRun"); 946 "BrowserMainLoop::CreateThreads:PreMainMessageLoopRun");
(...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
1476 DCHECK(is_tracing_startup_for_duration_); 1477 DCHECK(is_tracing_startup_for_duration_);
1477 1478
1478 is_tracing_startup_for_duration_ = false; 1479 is_tracing_startup_for_duration_ = false;
1479 TracingController::GetInstance()->StopTracing( 1480 TracingController::GetInstance()->StopTracing(
1480 TracingController::CreateFileSink( 1481 TracingController::CreateFileSink(
1481 startup_trace_file_, 1482 startup_trace_file_,
1482 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); 1483 base::Bind(OnStoppedStartupTracing, startup_trace_file_)));
1483 } 1484 }
1484 1485
1485 } // namespace content 1486 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698