views: Do not override CanResize() and CanMaximize() in FirstRunSearchEngineView.

These functions are returning false, but the default implementation in
WidgetDelegate already returns false, so we don't need to override them here.

And remove IsAlwaysOnTop() and HasAlwaysOnTopMenu() as they appear to be unused.

R=dmazzoni@chromium.org

Review URL: http://codereview.chromium.org/7934008

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

2 files changed, 19 insertions, 27 deletions

diff --git a/chrome/browser/ui/views/first_run_search_engine_view.cc b/chrome/browser/ui/views/first_run_search_engine_view.cc
index 991d699..443cbbc 100644
--- a/chrome/browser/ui/views/first_run_search_engine_view.cc
+++ b/chrome/browser/ui/views/first_run_search_engine_view.cc
@@ -166,6 +166,10 @@ FirstRunSearchEngineView::~FirstRunSearchEngineView() {
   search_engines_model_->RemoveObserver(this);
 }
 
+std::wstring FirstRunSearchEngineView::GetWindowTitle() const {
+  return UTF16ToWide(l10n_util::GetStringUTF16(IDS_FIRSTRUN_DLG_TITLE));
+}
+
 void FirstRunSearchEngineView::ButtonPressed(views::Button* sender,
                                              const views::Event& event) {
   SearchEngineChoice* choice = static_cast<SearchEngineChoice*>(sender);
@@ -457,7 +461,3 @@ void FirstRunSearchEngineView::GetAccessibleState(
     ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_ALERT;
 }
-
-std::wstring FirstRunSearchEngineView::GetWindowTitle() const {
-  return UTF16ToWide(l10n_util::GetStringUTF16(IDS_FIRSTRUN_DLG_TITLE));
-}
diff --git a/chrome/browser/ui/views/first_run_search_engine_view.h b/chrome/browser/ui/views/first_run_search_engine_view.h
index dc54ca1..5b59531 100644
--- a/chrome/browser/ui/views/first_run_search_engine_view.h
+++ b/chrome/browser/ui/views/first_run_search_engine_view.h
@@ -14,17 +14,15 @@
 #include "views/view.h"
 #include "views/widget/widget_delegate.h"
 
+class Profile;
+class TemplateURL;
+class TemplateURLService;
+
 namespace views {
-class ButtonListener;
 class ImageView;
 class Label;
-class Separator;
 }
 
-class Profile;
-class TemplateURL;
-class TemplateURLService;
-
 // This class holds the logo and TemplateURL for a search engine and serves
 // as its button in the search engine selection view.
 class SearchEngineChoice : public views::NativeTextButton {
@@ -75,10 +73,9 @@ class SearchEngineChoice : public views::NativeTextButton {
 
 // This class displays a large search engine choice dialog view during
 // initial first run import.
-class FirstRunSearchEngineView
-    : public views::ButtonListener,
-      public views::WidgetDelegateView,
-      public TemplateURLServiceObserver {
+class FirstRunSearchEngineView : public views::WidgetDelegateView,
+                                 public views::ButtonListener,
+                                 public TemplateURLServiceObserver {
  public:
   // |profile| allows us to get the set of imported search engines.
   // |randomize| is true if logos are to be displayed in random order.
@@ -86,25 +83,20 @@ class FirstRunSearchEngineView
 
   virtual ~FirstRunSearchEngineView();
 
-  bool IsAlwaysOnTop() const { return true; }
-  bool HasAlwaysOnTopMenu() const { return false; }
+  // Overridden from views::WidgetDelegateView:
+  virtual std::wstring GetWindowTitle() const OVERRIDE;
+  virtual views::View* GetContentsView() OVERRIDE { return this; }
+
+  // Overridden from views::ButtonListener:
+  virtual void ButtonPressed(views::Button* sender,
+                             const views::Event& event) OVERRIDE;
 
   // Overridden from views::View:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void Layout() OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
-  // Overridden from views::WidgetDelegate:
-  virtual std::wstring GetWindowTitle() const OVERRIDE;
-  views::View* GetContentsView() OVERRIDE { return this; }
-  bool CanResize() const OVERRIDE{ return false; }
-  bool CanMaximize() const OVERRIDE { return false; }
-
-  // Overridden from views::ButtonListener:
-  virtual void ButtonPressed(views::Button* sender, const views::Event& event)
-      OVERRIDE;
-
-  // Override from View so we can draw the gray background at dialog top.
+  // Override from views::View so we can draw the gray background at dialog top.
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
 
   // Overridden from TemplateURLServiceObserver. When the search engines have