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

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

Issue 2685513002: [For trybots test] [ScreenOrientation] Hide ScreenOrientationProvider inside WebContentsImpl. (Closed)
Patch Set: Fix android bots Created 3 years, 10 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 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 119
120 #if defined(OS_ANDROID) 120 #if defined(OS_ANDROID)
121 #include "base/android/jni_android.h" 121 #include "base/android/jni_android.h"
122 #include "components/tracing/common/graphics_memory_dump_provider_android.h" 122 #include "components/tracing/common/graphics_memory_dump_provider_android.h"
123 #include "content/browser/android/browser_startup_controller.h" 123 #include "content/browser/android/browser_startup_controller.h"
124 #include "content/browser/android/scoped_surface_request_manager.h" 124 #include "content/browser/android/scoped_surface_request_manager.h"
125 #include "content/browser/android/tracing_controller_android.h" 125 #include "content/browser/android/tracing_controller_android.h"
126 #include "content/browser/media/android/browser_media_player_manager.h" 126 #include "content/browser/media/android/browser_media_player_manager.h"
127 #include "content/browser/renderer_host/context_provider_factory_impl_android.h" 127 #include "content/browser/renderer_host/context_provider_factory_impl_android.h"
128 #include "content/browser/screen_orientation/screen_orientation_delegate_android .h" 128 #include "content/browser/screen_orientation/screen_orientation_delegate_android .h"
129 #include "content/public/browser/screen_orientation_provider.h"
130 #include "media/base/android/media_client_android.h" 129 #include "media/base/android/media_client_android.h"
131 #include "ui/android/screen_android.h" 130 #include "ui/android/screen_android.h"
132 #include "ui/display/screen.h" 131 #include "ui/display/screen.h"
133 #include "ui/gl/gl_surface.h" 132 #include "ui/gl/gl_surface.h"
134 #endif 133 #endif
135 134
136 #if defined(OS_MACOSX) 135 #if defined(OS_MACOSX)
137 #include "base/memory/memory_pressure_monitor_mac.h" 136 #include "base/memory/memory_pressure_monitor_mac.h"
138 #include "content/browser/bootstrap_sandbox_manager_mac.h" 137 #include "content/browser/bootstrap_sandbox_manager_mac.h"
139 #include "content/browser/cocoa/system_hotkey_helper_mac.h" 138 #include "content/browser/cocoa/system_hotkey_helper_mac.h"
(...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after
788 } 787 }
789 BrowserMediaPlayerManager::InitSurfaceTexturePeer(); 788 BrowserMediaPlayerManager::InitSurfaceTexturePeer();
790 } 789 }
791 790
792 if (!parsed_command_line_.HasSwitch( 791 if (!parsed_command_line_.HasSwitch(
793 switches::kDisableScreenOrientationLock)) { 792 switches::kDisableScreenOrientationLock)) {
794 TRACE_EVENT0("startup", 793 TRACE_EVENT0("startup",
795 "BrowserMainLoop::Subsystem:ScreenOrientationProvider"); 794 "BrowserMainLoop::Subsystem:ScreenOrientationProvider");
796 screen_orientation_delegate_.reset( 795 screen_orientation_delegate_.reset(
797 new ScreenOrientationDelegateAndroid()); 796 new ScreenOrientationDelegateAndroid());
798 ScreenOrientationProvider::SetDelegate(screen_orientation_delegate_.get());
799 } 797 }
800 #endif 798 #endif
801 799
802 #if defined(OS_MACOSX) 800 #if defined(OS_MACOSX)
803 if (BootstrapSandboxManager::ShouldEnable()) { 801 if (BootstrapSandboxManager::ShouldEnable()) {
804 TRACE_EVENT0("startup", 802 TRACE_EVENT0("startup",
805 "BrowserMainLoop::Subsystem:BootstrapSandbox"); 803 "BrowserMainLoop::Subsystem:BootstrapSandbox");
806 CHECK(BootstrapSandboxManager::GetInstance()); 804 CHECK(BootstrapSandboxManager::GetInstance());
807 } 805 }
808 #endif 806 #endif
(...skipping 984 matching lines...) Expand 10 before | Expand all | Expand 10 after
1793 if (!audio_manager_) { 1791 if (!audio_manager_) {
1794 audio_thread_ = base::MakeUnique<AudioManagerThread>(); 1792 audio_thread_ = base::MakeUnique<AudioManagerThread>();
1795 audio_manager_ = media::AudioManager::Create( 1793 audio_manager_ = media::AudioManager::Create(
1796 audio_thread_->task_runner(), audio_thread_->worker_task_runner(), 1794 audio_thread_->task_runner(), audio_thread_->worker_task_runner(),
1797 MediaInternals::GetInstance()); 1795 MediaInternals::GetInstance());
1798 } 1796 }
1799 CHECK(audio_manager_); 1797 CHECK(audio_manager_);
1800 } 1798 }
1801 1799
1802 } // namespace content 1800 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/android/content_view_core_impl.cc ('k') | content/browser/frame_host/render_frame_host_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698