Reland of Android: support multiple displays on C++ side

content/shell/browser/shell_android.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/shell/browser/shell.h"
 
 #include <jni.h>
 
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_piece.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/shell/android/shell_manager.h"
 #include "jni/Shell_jni.h"
+#include "ui/android/screen_android.h"
+#include "ui/display/screen.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
 
 namespace content {
 
 void Shell::PlatformInitialize(const gfx::Size& default_window_size) {
+  display::Screen::SetScreenInstance(ui::CreateScreenAndroid());
 }
 
 void Shell::PlatformExit() {
 }
 
 void Shell::PlatformCleanUp() {
   JNIEnv* env = AttachCurrentThread();
   if (java_object_.is_null())
     return;
   Java_Shell_onNativeDestroyed(env, java_object_);
@@ skipping 69 matching lines @@
 
 // static
 void CloseShell(JNIEnv* env,
                 const JavaParamRef<jclass>& clazz,
                 jlong shellPtr) {
   Shell* shell = reinterpret_cast<Shell*>(shellPtr);
   shell->Close();
 }
 
 }  // namespace content