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

Unified Diff: ash/display/display_controller.cc

Issue 574033003: Remove keyboard usability mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Compile error and unneccessary headers Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/display/display_controller.h ('k') | ash/display/display_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_controller.cc
diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc
index 173b2b7f9cf769ec529bb233e6b85a4ec3885638..b1267747b984fb3c54be8c6233dc1723cad8e745 100644
--- a/ash/display/display_controller.cc
+++ b/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"
@@ -251,8 +250,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 +261,6 @@ void DisplayController::Shutdown() {
cursor_window_controller_.reset();
mirror_window_controller_.reset();
- virtual_keyboard_window_controller_.reset();
Shell::GetScreen()->RemoveObserver(this);
@@ -666,12 +662,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();
@@ -681,7 +671,6 @@ void DisplayController::CreateOrUpdateNonDesktopDisplay(
void DisplayController::CloseNonDesktopDisplay() {
mirror_window_controller_->Close();
cursor_window_controller_->UpdateContainer();
- virtual_keyboard_window_controller_->Close();
}
void DisplayController::PreDisplayConfigurationChange(bool clear_focus) {
« no previous file with comments | « ash/display/display_controller.h ('k') | ash/display/display_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698