| Index: content/browser/browser_main_loop.cc
|
| diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
|
| index 648873d6c243ff38638dfb43e33d088dd150381f..1c5adb8857d54a9b0bbd38ec6564a164a0554dbb 100644
|
| --- a/content/browser/browser_main_loop.cc
|
| +++ b/content/browser/browser_main_loop.cc
|
| @@ -121,6 +121,8 @@
|
| #include "content/public/browser/screen_orientation_provider.h"
|
| #include "gpu/ipc/client/android/in_process_surface_texture_manager.h"
|
| #include "media/base/android/media_client_android.h"
|
| +#include "ui/android/screen_android.h"
|
| +#include "ui/display/screen.h"
|
| #include "ui/gl/gl_surface.h"
|
| #endif
|
|
|
| @@ -953,6 +955,11 @@ int BrowserMainLoop::CreateThreads() {
|
| }
|
|
|
| int BrowserMainLoop::PreMainMessageLoopRun() {
|
| +#if defined(OS_ANDROID)
|
| + // Let screen instance be overridable by parts.
|
| + display::Screen::SetScreenInstance(ui::CreateScreenAndroid());
|
| +#endif
|
| +
|
| if (parts_) {
|
| TRACE_EVENT0("startup",
|
| "BrowserMainLoop::CreateThreads:PreMainMessageLoopRun");
|
|
|