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

Unified Diff: chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc

Issue 2660873002: Move two utility functions from ash/screen_util.h to ui/wm/core/coordinate_conversion.h (Closed)
Patch Set: Created 3 years, 11 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/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
index 0f74b5fb3e11edce79e08a6d9fa73372edb9973d..d877119802877be7cc629555ad54833b596a63a2 100644
--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
@@ -15,7 +15,6 @@
#include "ash/common/wm/window_state_observer.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
-#include "ash/screen_util.h"
#include "ash/shared/app_types.h"
#include "ash/shared/immersive_fullscreen_controller.h"
#include "ash/shell.h"
@@ -39,6 +38,7 @@
#include "ui/views/controls/menu/menu_model_adapter.h"
#include "ui/views/controls/menu/menu_runner.h"
#include "ui/views/widget/widget.h"
+#include "ui/wm/core/coordinate_conversion.h"
using extensions::AppWindow;
@@ -199,8 +199,9 @@ void ChromeNativeAppWindowViewsAuraAsh::OnBeforePanelWidgetInit(
} else if (ash::Shell::HasInstance() && use_default_bounds) {
// Open a new panel on the target root.
init_params->context = ash::Shell::GetTargetRootWindow();
- init_params->bounds = ash::ScreenUtil::ConvertRectToScreen(
- ash::Shell::GetTargetRootWindow(), gfx::Rect(GetPreferredSize()));
+ init_params->bounds = gfx::Rect(GetPreferredSize());
+ wm::ConvertRectToScreen(ash::Shell::GetTargetRootWindow(),
+ &init_params->bounds);
}
}

Powered by Google App Engine
This is Rietveld 408576698