summaryrefslogtreecommitdiffstats
path: root/ash/shell/lock_view.cc
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-20 17:24:44 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-20 17:24:44 +0000
commite1b62b7f2241bc2feb8696a9f65e46438dbce64b (patch)
treef1c6d45056b7e78e54604054dbd68f14197ad9cd /ash/shell/lock_view.cc
parentc0858c55fec87318cabb97fe28bcd3e93578c0ee (diff)
downloadchromium_src-e1b62b7f2241bc2feb8696a9f65e46438dbce64b.zip
chromium_src-e1b62b7f2241bc2feb8696a9f65e46438dbce64b.tar.gz
chromium_src-e1b62b7f2241bc2feb8696a9f65e46438dbce64b.tar.bz2
views: Make view::Views::GetPreferredSize() const.
Due to button refactoring patches, we now need to ask views for their preferred sizes in const methods. Across the entire codebase, the overwhelming majority of GetPreferredSize() implementations could be const. There are only a few places where we can't, and they are usually combining the sizing and layout code. BookmarksBarView was simple enough to perform this separation. Most of the other places were solved by adding "mutable" to value caches. BUG=155363 R=jam@chromium.org, pkasting@chromium.org, scheib@chromium.org, sky@chromium.org, pkasting, sky TBR=jam, scheib Review URL: https://codereview.chromium.org/273223002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271682 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell/lock_view.cc')
-rw-r--r--ash/shell/lock_view.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/shell/lock_view.cc b/ash/shell/lock_view.cc
index d14b593..ed2e75d 100644
--- a/ash/shell/lock_view.cc
+++ b/ash/shell/lock_view.cc
@@ -35,7 +35,7 @@ class LockView : public views::WidgetDelegateView,
virtual ~LockView() {}
// Overridden from views::View:
- virtual gfx::Size GetPreferredSize() OVERRIDE {
+ virtual gfx::Size GetPreferredSize() const OVERRIDE {
return gfx::Size(500, 400);
}