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

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

Issue 1823763003: Move more files to gpu/ipc/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed Android Build Created 4 years, 9 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
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 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 1287 matching lines...) Expand 10 before | Expand all | Expand 10 after
1298 if (GpuDataManagerImpl::GetInstance()->GpuAccessAllowed(NULL) && 1298 if (GpuDataManagerImpl::GetInstance()->GpuAccessAllowed(NULL) &&
1299 !established_gpu_channel && 1299 !established_gpu_channel &&
1300 always_uses_gpu && 1300 always_uses_gpu &&
1301 !UsingInProcessGpu()) { 1301 !UsingInProcessGpu()) {
1302 TRACE_EVENT_INSTANT0("gpu", "Post task to launch GPU process", 1302 TRACE_EVENT_INSTANT0("gpu", "Post task to launch GPU process",
1303 TRACE_EVENT_SCOPE_THREAD); 1303 TRACE_EVENT_SCOPE_THREAD);
1304 BrowserThread::PostTask( 1304 BrowserThread::PostTask(
1305 BrowserThread::IO, FROM_HERE, 1305 BrowserThread::IO, FROM_HERE,
1306 base::Bind(base::IgnoreResult(&GpuProcessHost::Get), 1306 base::Bind(base::IgnoreResult(&GpuProcessHost::Get),
1307 GpuProcessHost::GPU_PROCESS_KIND_SANDBOXED, 1307 GpuProcessHost::GPU_PROCESS_KIND_SANDBOXED,
1308 CAUSE_FOR_GPU_LAUNCH_BROWSER_STARTUP)); 1308 gpu::CAUSE_FOR_GPU_LAUNCH_BROWSER_STARTUP));
1309 } 1309 }
1310 1310
1311 #if defined(OS_MACOSX) 1311 #if defined(OS_MACOSX)
1312 ThemeHelperMac::GetInstance(); 1312 ThemeHelperMac::GetInstance();
1313 SystemHotkeyHelperMac::GetInstance()->DeferredLoadSystemHotkeys(); 1313 SystemHotkeyHelperMac::GetInstance()->DeferredLoadSystemHotkeys();
1314 #endif // defined(OS_MACOSX) 1314 #endif // defined(OS_MACOSX)
1315 1315
1316 return result_code_; 1316 return result_code_;
1317 } 1317 }
1318 1318
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
1446 DCHECK(is_tracing_startup_for_duration_); 1446 DCHECK(is_tracing_startup_for_duration_);
1447 1447
1448 is_tracing_startup_for_duration_ = false; 1448 is_tracing_startup_for_duration_ = false;
1449 TracingController::GetInstance()->StopTracing( 1449 TracingController::GetInstance()->StopTracing(
1450 TracingController::CreateFileSink( 1450 TracingController::CreateFileSink(
1451 startup_trace_file_, 1451 startup_trace_file_,
1452 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); 1452 base::Bind(OnStoppedStartupTracing, startup_trace_file_)));
1453 } 1453 }
1454 1454
1455 } // namespace content 1455 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698