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

Unified Diff: ash/wm/overview/scoped_transform_overview_window.cc

Issue 138003007: [Cleanup] Screen cleanup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: make sure screen_for_shutdown is reset everytime Created 6 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
« no previous file with comments | « ash/wm/immersive_fullscreen_controller_unittest.cc ('k') | ash/wm/overview/scoped_window_copy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/overview/scoped_transform_overview_window.cc
diff --git a/ash/wm/overview/scoped_transform_overview_window.cc b/ash/wm/overview/scoped_transform_overview_window.cc
index 12b7c0c61f8ec216560fa98bd9223f0921d9cf15..9beb49fdfaa9a5fa126e7e3352b2f39b84603c54 100644
--- a/ash/wm/overview/scoped_transform_overview_window.cc
+++ b/ash/wm/overview/scoped_transform_overview_window.cc
@@ -4,7 +4,7 @@
#include "ash/wm/overview/scoped_transform_overview_window.h"
-#include "ash/screen_ash.h"
+#include "ash/screen_util.h"
#include "ash/shell.h"
#include "ash/wm/overview/scoped_window_copy.h"
#include "ash/wm/window_state.h"
@@ -139,7 +139,7 @@ gfx::Rect ScopedTransformOverviewWindow::GetBoundsInScreen() const {
gfx::Rect bounds;
aura::Window* window = window_;
while (window) {
- bounds.Union(ScreenAsh::ConvertRectToScreen(window->parent(),
+ bounds.Union(ScreenUtil::ConvertRectToScreen(window->parent(),
window->GetTargetBounds()));
window = GetModalTransientParent(window);
}
@@ -245,7 +245,7 @@ void ScopedTransformOverviewWindow::SetTransformOnWindowAndTransientChildren(
window_copies_.begin(); iter != window_copies_.end(); ++iter) {
SetTransformOnWindow(
(*iter)->GetWindow(),
- TranslateTransformOrigin(ScreenAsh::ConvertRectToScreen(
+ TranslateTransformOrigin(ScreenUtil::ConvertRectToScreen(
(*iter)->GetWindow()->parent(),
(*iter)->GetWindow()->GetTargetBounds()).origin() - origin,
transform),
@@ -253,7 +253,7 @@ void ScopedTransformOverviewWindow::SetTransformOnWindowAndTransientChildren(
}
SetTransformOnWindowAndAllTransientChildren(
window,
- TranslateTransformOrigin(ScreenAsh::ConvertRectToScreen(
+ TranslateTransformOrigin(ScreenUtil::ConvertRectToScreen(
window->parent(), window->GetTargetBounds()).origin() - origin,
transform),
animate);
« no previous file with comments | « ash/wm/immersive_fullscreen_controller_unittest.cc ('k') | ash/wm/overview/scoped_window_copy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698