Rename gfx::Display/Screen to display::Display/Screen in chrome

chrome/browser/ui/views/profiles/user_manager_view.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/ui/views/profiles/user_manager_view.h"
 
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/user_manager.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/guest_view/browser/guest_view_manager.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/screen.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/shell_integration_win.h"
 #include "ui/base/win/shell.h"
 #include "ui/views/win/hwnd_util.h"
@@ skipping 254 matching lines @@
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   const base::FilePath& last_used_profile_path =
       profile_manager->GetLastUsedProfileDir(profile_manager->user_data_dir());
   Profile* profile = profile_manager->GetProfileByPath(last_used_profile_path);
   if (profile) {
     Browser* browser = chrome::FindLastActiveWithProfile(profile);
     if (browser) {
       gfx::NativeView native_view =
           views::Widget::GetWidgetForNativeWindow(
               browser->window()->GetNativeWindow())->GetNativeView();
-      bounds = gfx::Screen::GetScreen()
+      bounds = display::Screen::GetScreen()
                    ->GetDisplayNearestWindow(native_view)
                    .work_area();
       bounds.ClampToCenteredSize(gfx::Size(UserManager::kWindowWidth,
                                            UserManager::kWindowHeight));
     }
   }
 
   DialogDelegate::CreateDialogWidgetWithBounds(this, NULL, NULL, bounds);
 
   // Since the User Manager can be the only top level window, we don't
@@ skipping 72 matching lines @@
   // Now that the window is closed, we can allow a new one to be opened.
   // (WindowClosing comes in asynchronously from the call to Close() and we
   // may have already opened a new instance).
   if (instance_ == this)
     instance_ = NULL;
 }
 
 bool UserManagerView::UseNewStyleForThisDialog() const {
   return false;
 }