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

Unified Diff: chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc

Issue 684143003: Make chrome/browser/ui/webui not depend on ash when using Athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_do_not_use_ash43_kiosk_mode
Patch Set: Created 6 years, 2 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
Index: chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
index 116e9ccee15e2c3bcda97a576c512da2f13dba70..d436fd768a3fa8bb4f6335d5f24d8726764a725c 100644
--- a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h"
-#include "ash/shell.h"
#include "base/memory/scoped_ptr.h"
#include "base/values.h"
#include "chrome/browser/browser_process.h"
@@ -389,7 +388,8 @@ void CoreOobeHandler::UpdateKeyboardState() {
}
void CoreOobeHandler::UpdateClientAreaSize() {
- const gfx::Size& size = ash::Shell::GetScreen()->GetPrimaryDisplay().size();
+ const gfx::Size& size =
+ gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().size();
SetClientAreaSize(size.width(), size.height());
}

Powered by Google App Engine
This is Rietveld 408576698