remove ash::ScreenUtil class
changes:
Remove ash::ScreenUtil class, as they are pure static methods, no state
members. Replace it with namespace screen_util with collection of
functions.
cd ash/
grep -rli 'ScreenUtil' * | xargs -i@ sed -i 's/ScreenUtil/screen_util/g' @
Bug: none
Test: ash_unittests
Change-Id: I7c2352e0dd1c49249579fc772d1ada88e33cf925
Reviewed-on: https://chromium-review.googlesource.com/874554
Reviewed-by: Scott Violet <[email protected]>
Commit-Queue: Qiang(Joe) Xu <[email protected]>
Cr-Commit-Position: refs/heads/master@{#530251}diff --git a/ash/screen_util.h b/ash/screen_util.h
index f7d6221..9c8ce825 100644
--- a/ash/screen_util.h
+++ b/ash/screen_util.h
@@ -6,51 +6,48 @@
#define ASH_SCREEN_UTIL_H_
#include "ash/ash_export.h"
-#include "base/macros.h"
namespace aura {
class Window;
-}
+} // namespace aura
namespace gfx {
class Rect;
-}
+} // namespace gfx
namespace ash {
-class ASH_EXPORT ScreenUtil {
- public:
- // Returns the bounds for maximized windows in parent coordinates.
- // Maximized windows trigger auto-hiding the shelf.
- static gfx::Rect GetMaximizedWindowBoundsInParent(aura::Window* window);
+namespace screen_util {
- // Returns the display bounds in parent coordinates.
- static gfx::Rect GetDisplayBoundsInParent(aura::Window* window);
+// Returns the bounds for maximized windows in parent coordinates.
+// Maximized windows trigger auto-hiding the shelf.
+ASH_EXPORT gfx::Rect GetMaximizedWindowBoundsInParent(aura::Window* window);
- // Returns the display's work area bounds in parent coordinates.
- static gfx::Rect GetDisplayWorkAreaBoundsInParent(aura::Window* window);
+// Returns the display bounds in parent coordinates.
+ASH_EXPORT gfx::Rect GetDisplayBoundsInParent(aura::Window* window);
- // Returns the display's work area bounds in parent coordinates on lock
- // screen, i.e. for work area with forced bottom alignment.
- // Note that unlike |GetDisplayWorkAreaBoundsInParent|, this method uses
- // work area bounds that are updated when the screen is locked. For example
- // if shelf alignment is set to right before screen lock,
- // |GetDisplayWorkAreaBoundsInParent| will return work are bounds for right
- // shelf alignment - this method will return work area for bottom shelf
- // alignment (which is always used on lock screen).
- static gfx::Rect GetDisplayWorkAreaBoundsInParentForLockScreen(
- aura::Window* window);
+// Returns the display's work area bounds in parent coordinates.
+ASH_EXPORT gfx::Rect GetDisplayWorkAreaBoundsInParent(aura::Window* window);
- // Returns the bounds of the physical display containing the shelf for
- // |window|. Physical displays can differ from logical displays in unified
- // desktop mode.
- // TODO(oshima): Consider using physical displays in window layout, instead of
- // root windows, and only use logical display in display management code.
- static gfx::Rect GetDisplayBoundsWithShelf(aura::Window* window);
+// Returns the display's work area bounds in parent coordinates on lock
+// screen, i.e. for work area with forced bottom alignment.
+// Note that unlike |GetDisplayWorkAreaBoundsInParent|, this method uses
+// work area bounds that are updated when the screen is locked. For example
+// if shelf alignment is set to right before screen lock,
+// |GetDisplayWorkAreaBoundsInParent| will return work are bounds for right
+// shelf alignment - this method will return work area for bottom shelf
+// alignment (which is always used on lock screen).
+ASH_EXPORT gfx::Rect GetDisplayWorkAreaBoundsInParentForLockScreen(
+ aura::Window* window);
- private:
- DISALLOW_IMPLICIT_CONSTRUCTORS(ScreenUtil);
-};
+// Returns the bounds of the physical display containing the shelf for
+// |window|. Physical displays can differ from logical displays in unified
+// desktop mode.
+// TODO(oshima): Consider using physical displays in window layout, instead of
+// root windows, and only use logical display in display management code.
+ASH_EXPORT gfx::Rect GetDisplayBoundsWithShelf(aura::Window* window);
+
+} // namespace screen_util
} // namespace ash
