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

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

Issue 1430673002: Headless demo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Better javascript 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
« no previous file with comments | « content/browser/BUILD.gn ('k') | headless/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 897 matching lines...) Expand 10 before | Expand all | Expand 10 after
908 } 908 }
909 created_threads_ = true; 909 created_threads_ = true;
910 return result_code_; 910 return result_code_;
911 } 911 }
912 912
913 int BrowserMainLoop::PreMainMessageLoopRun() { 913 int BrowserMainLoop::PreMainMessageLoopRun() {
914 #if defined(MOJO_SHELL_CLIENT) 914 #if defined(MOJO_SHELL_CLIENT)
915 if (IsRunningInMojoShell()) { 915 if (IsRunningInMojoShell()) {
916 MojoShellConnectionImpl::Create(); 916 MojoShellConnectionImpl::Create();
917 #if defined(USE_AURA) 917 #if defined(USE_AURA)
918 #if defined(TOOLKIT_VIEWS)
918 views::WindowManagerConnection::Create( 919 views::WindowManagerConnection::Create(
919 MojoShellConnection::Get()->GetApplication()); 920 MojoShellConnection::Get()->GetApplication());
920 #endif 921 #endif
922 #endif
921 } 923 }
922 #endif 924 #endif
923 925
924 if (parts_) { 926 if (parts_) {
925 TRACE_EVENT0("startup", 927 TRACE_EVENT0("startup",
926 "BrowserMainLoop::CreateThreads:PreMainMessageLoopRun"); 928 "BrowserMainLoop::CreateThreads:PreMainMessageLoopRun");
927 TRACK_SCOPED_REGION( 929 TRACK_SCOPED_REGION(
928 "Startup", "BrowserMainLoop::PreMainMessageLoopRun"); 930 "Startup", "BrowserMainLoop::PreMainMessageLoopRun");
929 931
930 parts_->PreMainMessageLoopRun(); 932 parts_->PreMainMessageLoopRun();
(...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after
1449 DCHECK(is_tracing_startup_for_duration_); 1451 DCHECK(is_tracing_startup_for_duration_);
1450 1452
1451 is_tracing_startup_for_duration_ = false; 1453 is_tracing_startup_for_duration_ = false;
1452 TracingController::GetInstance()->StopTracing( 1454 TracingController::GetInstance()->StopTracing(
1453 TracingController::CreateFileSink( 1455 TracingController::CreateFileSink(
1454 startup_trace_file_, 1456 startup_trace_file_,
1455 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); 1457 base::Bind(OnStoppedStartupTracing, startup_trace_file_)));
1456 } 1458 }
1457 1459
1458 } // namespace content 1460 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/BUILD.gn ('k') | headless/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698