Render settings dialog at proper size.

This fixes a regression in crrev.com/188277 by overriding
GetPreferredSize and CanResize.

BUG=219825


Review URL: https://chromiumcodereview.appspot.com/12441017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189079 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 10 insertions, 0 deletions

diff --git a/ui/message_center/views/notifier_settings_view.cc b/ui/message_center/views/notifier_settings_view.cc
index 1210f41..c535507 100644
--- a/ui/message_center/views/notifier_settings_view.cc
+++ b/ui/message_center/views/notifier_settings_view.cc
@@ -293,6 +293,10 @@ views::View* NotifierSettingsView::GetContentsView() {
   return this;
 }
 
+bool NotifierSettingsView::CanResize() const {
+  return true;
+}
+
 void NotifierSettingsView::Layout() {
   int title_height = title_entry_->GetPreferredSize().height();
   title_entry_->SetBounds(0, 0, width(), title_height);
@@ -303,6 +307,10 @@ gfx::Size NotifierSettingsView::GetMinimumSize() {
   return gfx::Size(kMinimumWindowWidth, kMinimumWindowHeight);
 }
 
+gfx::Size NotifierSettingsView::GetPreferredSize() {
+  return GetMinimumSize();
+}
+
 void NotifierSettingsView::ButtonPressed(views::Button* sender,
                                          const ui::Event& event) {
   std::set<NotifierButton*>::iterator iter = buttons_.find(
diff --git a/ui/message_center/views/notifier_settings_view.h b/ui/message_center/views/notifier_settings_view.h
index e615ae5..b6c3032 100644
--- a/ui/message_center/views/notifier_settings_view.h
+++ b/ui/message_center/views/notifier_settings_view.h
@@ -54,10 +54,12 @@ class MESSAGE_CENTER_EXPORT NotifierSettingsView
   // Overridden from views::WidgetDelegate:
   virtual void WindowClosing() OVERRIDE;
   virtual views::View* GetContentsView() OVERRIDE;
+  virtual bool CanResize() const OVERRIDE;
 
   // Overridden from views::View:
   virtual void Layout() OVERRIDE;
   virtual gfx::Size GetMinimumSize() OVERRIDE;
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
 
   // Overridden from views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender,