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

Unified Diff: chrome/browser/chromeos/login/helper.cc

Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix new addition Created 8 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/chromeos/login/helper.cc
diff --git a/chrome/browser/chromeos/login/helper.cc b/chrome/browser/chromeos/login/helper.cc
index c7350f758227f0da22076ce72aa4d185604ee0c4..503773785127e90380be9561e072c6d9354fcf1e 100644
--- a/chrome/browser/chromeos/login/helper.cc
+++ b/chrome/browser/chromeos/login/helper.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/chromeos/login/helper.h"
+#include "ash/shell.h"
#include "base/command_line.h"
#include "base/file_util.h"
#include "base/utf_string_conversions.h"
@@ -57,7 +58,7 @@ views::Throbber* CreateDefaultThrobber() {
}
gfx::Rect CalculateScreenBounds(const gfx::Size& size) {
- gfx::Rect bounds(gfx::Screen::GetPrimaryDisplay().bounds());
+ gfx::Rect bounds(ash::Shell::GetScreen()->GetPrimaryDisplay().bounds());
if (!size.IsEmpty()) {
int horizontal_diff = bounds.width() - size.width();
int vertical_diff = bounds.height() - size.height();
« no previous file with comments | « chrome/browser/chromeos/input_method/candidate_window.cc ('k') | chrome/browser/chromeos/login/webui_screen_locker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698