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

Unified Diff: chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc

Issue 1116313002: Layout login/lock screen, shelf and app list inside the first display in Unified Desktop mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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/wm/lock_window_state.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc b/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc
index 9b292260ba79d3ef83984857ca2400c6226192cc..5ad795025d1787c22cfb11ad1423c5418c977e26 100644
--- a/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc
@@ -7,7 +7,7 @@
#include <string>
#include "ash/display/display_controller.h"
-#include "ash/screen_util.h"
+#include "ash/display/display_manager.h"
#include "ash/shell.h"
#include "base/bind.h"
#include "base/logging.h"
@@ -115,7 +115,8 @@ void DisplayOverscanHandler::HandleStart(const base::ListValue* args) {
return;
}
- const gfx::Display& display = ash::ScreenUtil::GetDisplayForId(display_id);
+ const gfx::Display& display =
+ ash::Shell::GetInstance()->display_manager()->GetDisplayForId(display_id);
DCHECK(display.is_valid());
if (!display.is_valid())
return;
« no previous file with comments | « ash/wm/lock_window_state.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698