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

Unified Diff: chrome/browser/chromeos/accessibility/magnification_controller_browsertest.cc

Issue 2660873002: Move two utility functions from ash/screen_util.h to ui/wm/core/coordinate_conversion.h (Closed)
Patch Set: rebase Created 3 years, 10 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/accessibility/magnification_controller_browsertest.cc
diff --git a/chrome/browser/chromeos/accessibility/magnification_controller_browsertest.cc b/chrome/browser/chromeos/accessibility/magnification_controller_browsertest.cc
index a1383fb342d603eca2492cb15ceedff1adc7a171..62230e7b50cc0cefac79df473f9fd01f166359c5 100644
--- a/chrome/browser/chromeos/accessibility/magnification_controller_browsertest.cc
+++ b/chrome/browser/chromeos/accessibility/magnification_controller_browsertest.cc
@@ -5,7 +5,6 @@
#include <string>
#include "ash/magnifier/magnification_controller.h"
-#include "ash/screen_util.h"
#include "ash/shell.h"
#include "base/command_line.h"
#include "base/macros.h"
@@ -21,6 +20,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/test/browser_test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/wm/core/coordinate_conversion.h"
namespace chromeos {
@@ -151,9 +151,8 @@ class MagnificationControllerTest : public InProcessBrowserTest {
origin.Offset(view_bounds_in_screen.x(), view_bounds_in_screen.y());
gfx::Rect rect_in_screen(origin.x(), origin.y(), rect.width(),
rect.height());
-
- return ash::ScreenUtil::ConvertRectFromScreen(GetRootWindow(),
- rect_in_screen);
+ ::wm::ConvertRectFromScreen(GetRootWindow(), &rect_in_screen);
+ return rect_in_screen;
}
void SetFocusOnElement(const std::string& element_id) {
« no previous file with comments | « ash/wm/window_animations.cc ('k') | chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698