summaryrefslogtreecommitdiffstats
path: root/apps/ui
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-21 02:18:01 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-21 02:18:01 +0000
commit7a6305192b7a864a9b5ce931ef4714ac066c7a06 (patch)
tree787d0a349f5ba4052b584dd14255e08fcb6834c5 /apps/ui
parent7ec573f68447d3fc0347281b1d600e313fbc079b (diff)
downloadchromium_src-7a6305192b7a864a9b5ce931ef4714ac066c7a06.zip
chromium_src-7a6305192b7a864a9b5ce931ef4714ac066c7a06.tar.gz
chromium_src-7a6305192b7a864a9b5ce931ef4714ac066c7a06.tar.bz2
views: Also const-ify GetMaximumSize().
This is a followup patch to r271682, where I const-ified GetPreferredSize() and GetMinimumSize(), but deferred this because that patch touched 400 files. BUG=155363 R=sky@chromium.org TBR=scheib@chromium.org Review URL: https://codereview.chromium.org/296823002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271815 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/ui')
-rw-r--r--apps/ui/views/app_window_frame_view.cc2
-rw-r--r--apps/ui/views/app_window_frame_view.h2
-rw-r--r--apps/ui/views/native_app_window_views.cc2
-rw-r--r--apps/ui/views/native_app_window_views.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/apps/ui/views/app_window_frame_view.cc b/apps/ui/views/app_window_frame_view.cc
index 6718bb4..4fd0955 100644
--- a/apps/ui/views/app_window_frame_view.cc
+++ b/apps/ui/views/app_window_frame_view.cc
@@ -333,7 +333,7 @@ gfx::Size AppWindowFrameView::GetMinimumSize() const {
return min_size;
}
-gfx::Size AppWindowFrameView::GetMaximumSize() {
+gfx::Size AppWindowFrameView::GetMaximumSize() const {
gfx::Size max_size = widget_->client_view()->GetMaximumSize();
// Add to the client maximum size the height of any title bar and borders.
diff --git a/apps/ui/views/app_window_frame_view.h b/apps/ui/views/app_window_frame_view.h
index 1d13bbd..d7cbf9f 100644
--- a/apps/ui/views/app_window_frame_view.h
+++ b/apps/ui/views/app_window_frame_view.h
@@ -82,7 +82,7 @@ class AppWindowFrameView : public views::NonClientFrameView,
virtual const char* GetClassName() const OVERRIDE;
virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
virtual gfx::Size GetMinimumSize() const OVERRIDE;
- virtual gfx::Size GetMaximumSize() OVERRIDE;
+ virtual gfx::Size GetMaximumSize() const OVERRIDE;
// views::ButtonListener implementation.
virtual void ButtonPressed(views::Button* sender,
diff --git a/apps/ui/views/native_app_window_views.cc b/apps/ui/views/native_app_window_views.cc
index 88b9d27..08fd92b 100644
--- a/apps/ui/views/native_app_window_views.cc
+++ b/apps/ui/views/native_app_window_views.cc
@@ -295,7 +295,7 @@ gfx::Size NativeAppWindowViews::GetMinimumSize() const {
return size_constraints_.GetMinimumSize();
}
-gfx::Size NativeAppWindowViews::GetMaximumSize() {
+gfx::Size NativeAppWindowViews::GetMaximumSize() const {
return size_constraints_.GetMaximumSize();
}
diff --git a/apps/ui/views/native_app_window_views.h b/apps/ui/views/native_app_window_views.h
index f42c4da..bdebfde 100644
--- a/apps/ui/views/native_app_window_views.h
+++ b/apps/ui/views/native_app_window_views.h
@@ -128,7 +128,7 @@ class NativeAppWindowViews : public NativeAppWindow,
virtual void ViewHierarchyChanged(
const ViewHierarchyChangedDetails& details) OVERRIDE;
virtual gfx::Size GetMinimumSize() const OVERRIDE;
- virtual gfx::Size GetMaximumSize() OVERRIDE;
+ virtual gfx::Size GetMaximumSize() const OVERRIDE;
virtual void OnFocus() OVERRIDE;
// NativeAppWindow implementation.