Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / ash / display / display_controller.cc

diff --git a/src/ash/display/display_controller.cc b/src/ash/display/display_controller.cc
index 366946a..f6192ca 100644 (file)
--- a/src/ash/display/display_controller.cc
+++ b/src/ash/display/display_controller.cc
@@ -14,7 +14,6 @@
 #include "ash/display/display_manager.h"
 #include "ash/display/mirror_window_controller.h"
 #include "ash/display/root_window_transformers.h"
-#include "ash/display/virtual_keyboard_window_controller.h"
 #include "ash/host/ash_window_tree_host.h"
 #include "ash/host/ash_window_tree_host_init_params.h"
 #include "ash/host/root_window_transformer.h"
@@ -128,9 +127,9 @@ void SetDisplayPropertiesOnHost(AshWindowTreeHost* ash_host,
       CreateRootWindowTransformerForDisplay(host->window(), display));
   ash_host->SetRootWindowTransformer(transformer.Pass());
 
-  DisplayMode mode;
-  if (GetDisplayManager()->GetSelectedModeForDisplayId(display.id(), &mode) &&
-      mode.refresh_rate > 0.0f) {
+  DisplayMode mode =
+      GetDisplayManager()->GetActiveModeForDisplayId(display.id());
+  if (mode.refresh_rate > 0.0f) {
     host->compositor()->vsync_manager()->SetAuthoritativeVSyncInterval(
         base::TimeDelta::FromMicroseconds(
             base::Time::kMicrosecondsPerSecond / mode.refresh_rate));
@@ -249,10 +248,6 @@ DisplayController::~DisplayController() {
 }
 
 void DisplayController::Start() {
-  // Created here so that Shell has finished being created. Adds itself
-  // as a ShellObserver.
-  virtual_keyboard_window_controller_.reset(
-      new VirtualKeyboardWindowController);
   Shell::GetScreen()->AddObserver(this);
   Shell::GetInstance()->display_manager()->set_delegate(this);
 }
@@ -264,7 +259,6 @@ void DisplayController::Shutdown() {
 
   cursor_window_controller_.reset();
   mirror_window_controller_.reset();
-  virtual_keyboard_window_controller_.reset();
 
   Shell::GetScreen()->RemoveObserver(this);
 
@@ -665,12 +659,6 @@ void DisplayController::CreateOrUpdateNonDesktopDisplay(
     case DisplayManager::MIRRORING:
       mirror_window_controller_->UpdateWindow(info);
       cursor_window_controller_->UpdateContainer();
-      virtual_keyboard_window_controller_->Close();
-      break;
-    case DisplayManager::VIRTUAL_KEYBOARD:
-      mirror_window_controller_->Close();
-      cursor_window_controller_->UpdateContainer();
-      virtual_keyboard_window_controller_->UpdateWindow(info);
       break;
     case DisplayManager::EXTENDED:
       NOTREACHED();
@@ -685,7 +673,6 @@ void DisplayController::CloseNonDesktopDisplay() {
   // to handle the cursor_window at all. See: http://crbug.com/412910
   if (!cursor_window_controller_->is_cursor_compositing_enabled())
     cursor_window_controller_->UpdateContainer();
-  virtual_keyboard_window_controller_->Close();
 }
 
 void DisplayController::PreDisplayConfigurationChange(bool clear_focus) {