Add support for DisplayConfigurator for content_shell

content/shell/browser/shell_views.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 "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/sys_info.h"
 #include "content/public/browser/context_factory.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/context_menu_params.h"
 #include "content/shell/browser/shell_platform_data_aura.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
@@ skipping 13 matching lines @@
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/test/desktop_test_views_delegate.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "ui/aura/test/test_screen.h"
+#include "ui/display/chromeos/display_configurator.h"
+#include "ui/display/types/display_snapshot.h"
 #include "ui/wm/test/wm_test_helper.h"
 #else  // !defined(OS_CHROMEOS)
 #include "ui/views/widget/desktop_aura/desktop_screen.h"
 #endif
 
 #if defined(OS_WIN)
 #include <fcntl.h>
 #include <io.h>
 #endif
 
@@ skipping 88 matching lines @@
     Layout();
 
     // Resize the widget, keeping the same origin.
     gfx::Rect bounds = GetWidget()->GetWindowBoundsInScreen();
     bounds.set_size(GetWidget()->GetRootView()->GetPreferredSize());
     GetWidget()->SetBounds(bounds);
 
     // Resizing a widget on chromeos doesn't automatically resize the root, need
     // to explicitly do that.
 #if defined(OS_CHROMEOS)
-    GetWidget()->GetNativeWindow()->GetHost()->SetBounds(bounds);
+    if (!base::SysInfo::IsRunningOnChromeOS())
+      GetWidget()->GetNativeWindow()->GetHost()->SetBounds(bounds);
 #endif
   }
 
   void SetWindowTitle(const base::string16& title) { title_ = title; }
   void EnableUIControl(UIControl control, bool is_enabled) {
     if (control == BACK_BUTTON) {
       back_button_->SetState(is_enabled ? views::CustomButton::STATE_NORMAL
           : views::CustomButton::STATE_DISABLED);
     } else if (control == FORWARD_BUTTON) {
       forward_button_->SetState(is_enabled ? views::CustomButton::STATE_NORMAL
@@ skipping 232 matching lines @@
   View* contents_view_;
   views::WebView* web_view_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellWindowDelegateView);
 };
 
 }  // namespace
 
 #if defined(OS_CHROMEOS)
 wm::WMTestHelper* Shell::wm_test_helper_ = NULL;
+ui::DisplayConfigurator* Shell::display_configurator_ = nullptr;
 gfx::Screen* Shell::test_screen_ = NULL;
 #endif
 views::ViewsDelegate* Shell::views_delegate_ = NULL;
 
 // static
 void Shell::PlatformInitialize(const gfx::Size& default_window_size) {
 #if defined(OS_WIN)
   _setmode(_fileno(stdout), _O_BINARY);
   _setmode(_fileno(stderr), _O_BINARY);
 #endif
 #if defined(OS_CHROMEOS)
   chromeos::DBusThreadManager::Initialize();
+
+  gfx::Size display_size = default_window_size;
+  if (base::SysInfo::IsRunningOnChromeOS()) {
+    display_configurator_ = new ui::DisplayConfigurator();
+    display_configurator_->Init(false);
+    display_configurator_->ForceInitialConfigure(0);
+
+    const auto& displays = display_configurator_->cached_displays();
+    if (!displays.empty())
+      display_size = displays[0]->current_mode()->size();
+  }
+
   test_screen_ = aura::TestScreen::Create(gfx::Size());
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_);
-  wm_test_helper_ = new wm::WMTestHelper(default_window_size,
+  wm_test_helper_ = new wm::WMTestHelper(display_size,
                                          GetContextFactory());
 #else
   gfx::Screen::SetScreenInstance(
       gfx::SCREEN_TYPE_NATIVE, views::CreateDesktopScreen());
 #endif
   views_delegate_ = new ShellViewsDelegateAura();
 }
 
 void Shell::PlatformExit() {
 #if defined(OS_CHROMEOS)
+  if (display_configurator_) {
+    delete display_configurator_;
+    display_configurator_ = nullptr;
+  }
+
   delete wm_test_helper_;
   wm_test_helper_ = NULL;
 
   delete test_screen_;
   test_screen_ = NULL;
 #endif
   delete views_delegate_;
   views_delegate_ = NULL;
   delete platform_;
   platform_ = NULL;
@@ skipping 110 matching lines @@
     const content::ContextMenuParams& params) {
   if (headless_)
     return true;
   ShellWindowDelegateView* delegate_view =
     static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
   delegate_view->ShowWebViewContextMenu(params);
   return true;
 }
 
 }  // namespace content