summaryrefslogtreecommitdiffstats
path: root/ash/shelf
diff options
context:
space:
mode:
authorbruthig@chromium.org <bruthig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-16 19:07:46 +0000
committerbruthig@chromium.org <bruthig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-16 19:07:46 +0000
commit76bc46334ee9948e43f5bec8c5436d8446acc5a2 (patch)
treeec7704e783d471602004395f5404692e2c1d2791 /ash/shelf
parent088661e28a7c26fa6e443540010e4b203851842f (diff)
downloadchromium_src-76bc46334ee9948e43f5bec8c5436d8446acc5a2.zip
chromium_src-76bc46334ee9948e43f5bec8c5436d8446acc5a2.tar.gz
chromium_src-76bc46334ee9948e43f5bec8c5436d8446acc5a2.tar.bz2
Add const to PanelLayoutManagerTest::IsPanelAboveLauncherIcon 'panel' parameter
BUG=none Review URL: https://codereview.chromium.org/331843003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277511 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shelf')
-rw-r--r--ash/shelf/shelf.cc3
-rw-r--r--ash/shelf/shelf.h2
-rw-r--r--ash/shelf/shelf_util.cc2
-rw-r--r--ash/shelf/shelf_util.h2
4 files changed, 5 insertions, 4 deletions
diff --git a/ash/shelf/shelf.cc b/ash/shelf/shelf.cc
index 2d988fc..f9d3704 100644
--- a/ash/shelf/shelf.cc
+++ b/ash/shelf/shelf.cc
@@ -80,7 +80,8 @@ void Shelf::SetAlignment(ShelfAlignment alignment) {
// ShelfLayoutManager will resize the shelf.
}
-gfx::Rect Shelf::GetScreenBoundsOfItemIconForWindow(aura::Window* window) {
+gfx::Rect Shelf::GetScreenBoundsOfItemIconForWindow(
+ const aura::Window* window) {
ShelfID id = GetShelfIDForWindow(window);
gfx::Rect bounds(shelf_view_->GetIdealBoundsOfItemIcon(id));
gfx::Point screen_origin;
diff --git a/ash/shelf/shelf.h b/ash/shelf/shelf.h
index 2b06d82..88cd060 100644
--- a/ash/shelf/shelf.h
+++ b/ash/shelf/shelf.h
@@ -63,7 +63,7 @@ class ASH_EXPORT Shelf {
// Returns the screen bounds of the item for the specified window. If there is
// no item for the specified window an empty rect is returned.
- gfx::Rect GetScreenBoundsOfItemIconForWindow(aura::Window* window);
+ gfx::Rect GetScreenBoundsOfItemIconForWindow(const aura::Window* window);
// Updates the icon position given the current window bounds. This is used
// when dragging panels to reposition them with respect to the other panels.
diff --git a/ash/shelf/shelf_util.cc b/ash/shelf/shelf_util.cc
index 2d008ff..af773b4 100644
--- a/ash/shelf/shelf_util.cc
+++ b/ash/shelf/shelf_util.cc
@@ -27,7 +27,7 @@ void SetShelfIDForWindow(ShelfID id, aura::Window* window) {
window->SetProperty(kShelfID, id);
}
-ShelfID GetShelfIDForWindow(aura::Window* window) {
+ShelfID GetShelfIDForWindow(const aura::Window* window) {
DCHECK(window);
return window->GetProperty(kShelfID);
}
diff --git a/ash/shelf/shelf_util.h b/ash/shelf/shelf_util.h
index 7e5dae1..f93f42e 100644
--- a/ash/shelf/shelf_util.h
+++ b/ash/shelf/shelf_util.h
@@ -30,7 +30,7 @@ ASH_EXPORT void SetShelfIDForWindow(ShelfID id, aura::Window* window);
// or 0 if there isn't one.
// Note: Window of a tabbed browser will return the |ShelfID| of the
// currently active tab.
-ASH_EXPORT ShelfID GetShelfIDForWindow(aura::Window* window);
+ASH_EXPORT ShelfID GetShelfIDForWindow(const aura::Window* window);
// Sets ShelfItemDetails for |window|.
ASH_EXPORT void SetShelfItemDetailsForWindow(aura::Window* window,