Remove now-unnecessary wrappers around gfx::Screen::GetScreen()

chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.cc

 // Copyright 2014 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/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h"
 
-#include "ash/shell.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chrome/browser/chromeos/ui/idle_app_name_notification_view.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "components/user_manager/user_manager.h"
 #include "extensions/browser/extension_system.h"
@@ skipping 52 matching lines @@
   }
 }
 
 void KioskModeIdleAppNameNotification::Setup() {
   DCHECK(user_manager::UserManager::Get()->IsUserLoggedIn());
   Start();
 }
 
 void KioskModeIdleAppNameNotification::OnUserActivity(const ui::Event* event) {
   if (show_notification_upon_next_user_activity_) {
-    gfx::Display display = ash::Shell::GetScreen()->GetPrimaryDisplay();
+    gfx::Display display = gfx::Screen::GetScreen()->GetPrimaryDisplay();
     // Display the notification only on internal display.
     if (display.IsInternal()) {
       base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
       const std::string app_id =
           command_line->GetSwitchValueASCII(::switches::kAppId);
       Profile* profile = ProfileManager::GetActiveUserProfile();
       notification_.reset(
           new IdleAppNameNotificationView(
               kMessageVisibilityTimeMs,
               kMessageAnimationTimeMs,
@@ skipping 34 matching lines @@
         base::Bind(&KioskModeIdleAppNameNotification::OnTimeout,
                    base::Unretained(this)));
   }
 }
 
 void KioskModeIdleAppNameNotification::OnTimeout() {
   show_notification_upon_next_user_activity_ = true;
 }
 
 }  // namespace chromeos