chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc - Issue 684143003: Make chrome/browser/ui/webui not depend on ash when using Athena

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

« chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc ('K') | « chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc ('k') | chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc » ('j') | chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..e24630cb37aed3ca8f09576f7a02f193d51c0a03 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"

@@ -31,6 +30,7 @@

#include "ui/keyboard/keyboard_controller.h"

#if !defined(USE_ATHENA)

+#include "ash/shell.h"

#include "chrome/browser/chromeos/accessibility/magnification_manager.h"

#endif

@@ -389,8 +389,10 @@ void CoreOobeHandler::UpdateKeyboardState() {

}

void CoreOobeHandler::UpdateClientAreaSize() {

+#if !defined(USE_ATHENA)

const gfx::Size& size = ash::Shell::GetScreen()->GetPrimaryDisplay().size();

oshima 2014/10/30 18:08:41 Can you just use gfx::Screen::GetNativeScren()->G

pkotwicz 2014/10/30 21:31:41 Done.

SetClientAreaSize(size.width(), size.height());

+#endif

}

void CoreOobeHandler::OnAccessibilityStatusChanged(