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

Unified Diff: chrome/browser/chromeos/extensions/file_manager_util.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/extensions/file_manager_util.cc
diff --git a/chrome/browser/chromeos/extensions/file_manager_util.cc b/chrome/browser/chromeos/extensions/file_manager_util.cc
index e856b20191181f593886d18d2390d1c401aaa23f..02baeac51de9361d511e92b2fb0060161aa7a3a6 100644
--- a/chrome/browser/chromeos/extensions/file_manager_util.cc
+++ b/chrome/browser/chromeos/extensions/file_manager_util.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "chrome/browser/chromeos/extensions/file_manager_util.h"
+#include "ash/shell.h"
#include "base/bind.h"
#include "base/file_util.h"
#include "base/json/json_reader.h"
@@ -521,7 +522,7 @@ void OpenActionChoiceDialog(const FilePath& path) {
url += "#/" + net::EscapeUrlEncodedData(virtual_path.value(), false);
GURL dialog_url(url);
- const gfx::Size screen = gfx::Screen::GetPrimaryDisplay().size();
+ const gfx::Size screen = ash::Shell::GetScreen()->GetPrimaryDisplay().size();
const gfx::Rect bounds((screen.width() - kDialogWidth) / 2,
(screen.height() - kDialogHeight) / 2,
kDialogWidth,

Powered by Google App Engine
This is Rietveld 408576698