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

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

Issue 1770073002: SurfaceTexture* => gpu/ipc/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Restored BUILD.gn bits 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 620 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 if (is_tracing_startup_for_duration_) { 631 if (is_tracing_startup_for_duration_) {
632 TRACE_EVENT0("startup", "BrowserMainLoop::InitStartupTracingForDuration"); 632 TRACE_EVENT0("startup", "BrowserMainLoop::InitStartupTracingForDuration");
633 InitStartupTracingForDuration(parsed_command_line_); 633 InitStartupTracingForDuration(parsed_command_line_);
634 } 634 }
635 #endif // !defined(OS_IOS) 635 #endif // !defined(OS_IOS)
636 636
637 #if defined(OS_ANDROID) 637 #if defined(OS_ANDROID)
638 { 638 {
639 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:SurfaceTextureManager"); 639 TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:SurfaceTextureManager");
640 if (parsed_command_line_.HasSwitch(switches::kSingleProcess)) { 640 if (parsed_command_line_.HasSwitch(switches::kSingleProcess)) {
641 SurfaceTextureManager::SetInstance( 641 gpu::SurfaceTextureManager::SetInstance(
642 InProcessSurfaceTextureManager::GetInstance()); 642 InProcessSurfaceTextureManager::GetInstance());
643 } else { 643 } else {
644 SurfaceTextureManager::SetInstance( 644 gpu::SurfaceTextureManager::SetInstance(
645 BrowserSurfaceTextureManager::GetInstance()); 645 BrowserSurfaceTextureManager::GetInstance());
646 } 646 }
647 } 647 }
648 648
649 if (!parsed_command_line_.HasSwitch( 649 if (!parsed_command_line_.HasSwitch(
650 switches::kDisableScreenOrientationLock)) { 650 switches::kDisableScreenOrientationLock)) {
651 TRACE_EVENT0("startup", 651 TRACE_EVENT0("startup",
652 "BrowserMainLoop::Subsystem:ScreenOrientationProvider"); 652 "BrowserMainLoop::Subsystem:ScreenOrientationProvider");
653 screen_orientation_delegate_.reset( 653 screen_orientation_delegate_.reset(
654 new ScreenOrientationDelegateAndroid()); 654 new ScreenOrientationDelegateAndroid());
(...skipping 811 matching lines...) Expand 10 before | Expand all | Expand 10 after
1466 DCHECK(is_tracing_startup_for_duration_); 1466 DCHECK(is_tracing_startup_for_duration_);
1467 1467
1468 is_tracing_startup_for_duration_ = false; 1468 is_tracing_startup_for_duration_ = false;
1469 TracingController::GetInstance()->StopTracing( 1469 TracingController::GetInstance()->StopTracing(
1470 TracingController::CreateFileSink( 1470 TracingController::CreateFileSink(
1471 startup_trace_file_, 1471 startup_trace_file_,
1472 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); 1472 base::Bind(OnStoppedStartupTracing, startup_trace_file_)));
1473 } 1473 }
1474 1474
1475 } // namespace content 1475 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/android/in_process_surface_texture_manager.h ('k') | content/common/android/surface_texture_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698