chrome/browser/chromeos/login/helper.cc - Issue 689683004: Make login code not depend on Ash when use_athena=1

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/chromeos/login/helper.cc

Issue 689683004: Make login code not depend on Ash when use_athena=1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_do_not_use_ash44_ui

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

« no previous file with comments | « chrome/browser/chromeos/login/chrome_restart_request.cc ('k') | chrome/browser/chromeos/login/lock/webui_screen_locker.h » ('j') | chrome/browser/chromeos/login/ui/login_display_host_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/helper.cc

diff --git a/chrome/browser/chromeos/login/helper.cc b/chrome/browser/chromeos/login/helper.cc

index 3735153b9b34ec5628b3fe1583518647c7005e82..14660640fbaf40bd76eb43beeb906c2921132fb8 100644

--- a/chrome/browser/chromeos/login/helper.cc

+++ b/chrome/browser/chromeos/login/helper.cc

@@ -4,7 +4,6 @@

#include "chrome/browser/chromeos/login/helper.h"

-#include "ash/shell.h"

#include "base/command_line.h"

#include "base/strings/utf_string_conversions.h"

#include "chrome/grit/generated_resources.h"

@@ -20,7 +19,8 @@

namespace chromeos {

gfx::Rect CalculateScreenBounds(const gfx::Size& size) {

- gfx::Rect bounds(ash::Shell::GetScreen()->GetPrimaryDisplay().bounds());

+ gfx::Rect bounds =

+ gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().bounds();

if (!size.IsEmpty()) {

int horizontal_diff = bounds.width() - size.width();

int vertical_diff = bounds.height() - size.height();