[Cleanup] Screen cleanup

chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc

 // Copyright (c) 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 "chrome/browser/ui/ash/ash_keyboard_controller_proxy.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/shell.h"
 #include "chrome/browser/extensions/event_names.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
@@ skipping 165 matching lines @@
     container->layer()->SetOpacity(1.0);
   }
 
   // TODO(bshe): Add animation observer and do the workspace resizing after
   // animation finished.
   KeyboardControllerProxy::ShowKeyboardContainer(container);
   // GetTextInputClient may return NULL when keyboard-usability-experiment flag
   // is set.
   if (GetInputMethod()->GetTextInputClient()) {
     gfx::Rect showing_area =
-        ash::DisplayController::GetPrimaryDisplay().work_area();
+        ash::Shell::GetScreen()->GetPrimaryDisplay().work_area();
     GetInputMethod()->GetTextInputClient()->EnsureCaretInRect(showing_area);
   }
 }
 
 void AshKeyboardControllerProxy::HideKeyboardContainer(
     aura::Window* container) {
   // The following animation settings should persist within this function scope.
   // Otherwise, a call to base class function HideKeyboardContainer will hide
   // the container immediately.
   ui::LayerAnimator* container_animator = container->layer()->GetAnimator();
@@ skipping 52 matching lines @@
   input_context->SetString("type",
       Context::ToString(TextInputTypeToGeneratedInputTypeEnum(type)));
   event_args->Append(input_context.release());
 
   scoped_ptr<extensions::Event> event(new extensions::Event(
       virtual_keyboard_private::OnTextInputBoxFocused::kEventName,
       event_args.Pass()));
   event->restrict_to_browser_context = context;
   router->DispatchEventToExtension(kVirtualKeyboardExtensionID, event.Pass());
 }