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

Side by Side Diff: ash/screen_ash.h

Issue 10795013: Rename bounds accessors to be intuitive and consistent (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 5 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/root_window_controller_unittest.cc ('k') | ash/screen_ash.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_SCREEN_ASH_H_ 5 #ifndef ASH_SCREEN_ASH_H_
6 #define ASH_SCREEN_ASH_H_ 6 #define ASH_SCREEN_ASH_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "ui/gfx/insets.h" 10 #include "ui/gfx/insets.h"
11 #include "ui/gfx/rect.h" 11 #include "ui/gfx/rect.h"
12 #include "ui/gfx/screen_impl.h" 12 #include "ui/gfx/screen_impl.h"
13 13
14 namespace ash { 14 namespace ash {
15 15
16 // Aura implementation of gfx::Screen. Implemented here to avoid circular 16 // Aura implementation of gfx::Screen. Implemented here to avoid circular
17 // dependencies. 17 // dependencies.
18 class ASH_EXPORT ScreenAsh : public gfx::ScreenImpl { 18 class ASH_EXPORT ScreenAsh : public gfx::ScreenImpl {
19 public: 19 public:
20 ScreenAsh(); 20 ScreenAsh();
21 virtual ~ScreenAsh(); 21 virtual ~ScreenAsh();
22 22
23 // Returns the bounds for maximized windows in parent coordinates. 23 // Returns the bounds for maximized windows in parent coordinates.
24 // Maximized windows trigger auto-hiding the shelf. 24 // Maximized windows trigger auto-hiding the shelf.
25 static gfx::Rect GetMaximizedWindowParentBounds(aura::Window* window); 25 static gfx::Rect GetMaximizedWindowBoundsInParent(aura::Window* window);
26 26
27 // Returns work area when a maximized window is not present in 27 // Returns work area when a maximized window is not present in
28 // parent coordinates. 28 // parent coordinates.
29 static gfx::Rect GetUnmaximizedWorkAreaParentBounds(aura::Window* window); 29 static gfx::Rect GetUnmaximizedWorkAreaBoundsInParent(aura::Window* window);
30 30
31 // Returns the display bounds in parent coordinates. 31 // Returns the display bounds in parent coordinates.
32 static gfx::Rect GetDisplayParentBounds(aura::Window* window); 32 static gfx::Rect GetDisplayBoundsInParent(aura::Window* window);
33 33
34 // Returns the display's work area bounds in parent coordinates. 34 // Returns the display's work area bounds in parent coordinates.
35 static gfx::Rect GetDisplayWorkAreaParentBounds(aura::Window* window); 35 static gfx::Rect GetDisplayWorkAreaBoundsInParent(aura::Window* window);
36 36
37 // Converts |rect| from |window|'s coordinates to the virtual screen 37 // Converts |rect| from |window|'s coordinates to the virtual screen
38 // coordinates. 38 // coordinates.
39 static gfx::Rect ConvertRectToScreen(aura::Window* window, 39 static gfx::Rect ConvertRectToScreen(aura::Window* window,
40 const gfx::Rect& rect); 40 const gfx::Rect& rect);
41 41
42 // Converts |rect| from virtual screen coordinates to the |window|'s 42 // Converts |rect| from virtual screen coordinates to the |window|'s
43 // coordinates. 43 // coordinates.
44 static gfx::Rect ConvertRectFromScreen(aura::Window* window, 44 static gfx::Rect ConvertRectFromScreen(aura::Window* window,
45 const gfx::Rect& rect); 45 const gfx::Rect& rect);
(...skipping 11 matching lines...) Expand all
57 const gfx::Rect& match_rect) const OVERRIDE; 57 const gfx::Rect& match_rect) const OVERRIDE;
58 virtual gfx::Display GetPrimaryDisplay() const OVERRIDE; 58 virtual gfx::Display GetPrimaryDisplay() const OVERRIDE;
59 59
60 private: 60 private:
61 DISALLOW_COPY_AND_ASSIGN(ScreenAsh); 61 DISALLOW_COPY_AND_ASSIGN(ScreenAsh);
62 }; 62 };
63 63
64 } // namespace ash 64 } // namespace ash
65 65
66 #endif // ASH_SCREEN_ASH_H_ 66 #endif // ASH_SCREEN_ASH_H_
OLDNEW
« no previous file with comments | « ash/root_window_controller_unittest.cc ('k') | ash/screen_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698