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

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

Issue 262883011: Makes PlatformEventSource creation in Env conditional (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months 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 | Annotate | Revision Log
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/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 1052 matching lines...) Expand 10 before | Expand all | Expand 10 after
1063 1063
1064 #if defined(USE_AURA) 1064 #if defined(USE_AURA)
1065 1065
1066 #if defined(USE_X11) 1066 #if defined(USE_X11)
1067 if (!gfx::GetXDisplay()) 1067 if (!gfx::GetXDisplay())
1068 return false; 1068 return false;
1069 #endif 1069 #endif
1070 1070
1071 // Env creates the compositor. Aura widgets need the compositor to be created 1071 // Env creates the compositor. Aura widgets need the compositor to be created
1072 // before they can be initialized by the browser. 1072 // before they can be initialized by the browser.
1073 aura::Env::CreateInstance(); 1073 aura::Env::CreateInstance(true);
1074 #endif // defined(USE_AURA) 1074 #endif // defined(USE_AURA)
1075 1075
1076 if (parts_) 1076 if (parts_)
1077 parts_->ToolkitInitialized(); 1077 parts_->ToolkitInitialized();
1078 1078
1079 return true; 1079 return true;
1080 } 1080 }
1081 1081
1082 void BrowserMainLoop::MainMessageLoopRun() { 1082 void BrowserMainLoop::MainMessageLoopRun() {
1083 #if defined(OS_ANDROID) 1083 #if defined(OS_ANDROID)
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
1130 base::TimeDelta::FromSeconds(delay_secs)); 1130 base::TimeDelta::FromSeconds(delay_secs));
1131 } 1131 }
1132 1132
1133 void BrowserMainLoop::EndStartupTracing(const base::FilePath& trace_file) { 1133 void BrowserMainLoop::EndStartupTracing(const base::FilePath& trace_file) {
1134 is_tracing_startup_ = false; 1134 is_tracing_startup_ = false;
1135 TracingController::GetInstance()->DisableRecording( 1135 TracingController::GetInstance()->DisableRecording(
1136 trace_file, base::Bind(&OnStoppedStartupTracing)); 1136 trace_file, base::Bind(&OnStoppedStartupTracing));
1137 } 1137 }
1138 1138
1139 } // namespace content 1139 } // namespace content
OLDNEW
« no previous file with comments | « chrome/test/base/view_event_test_base.cc ('k') | content/browser/renderer_host/input/touch_emulator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698