Fix even more crashes. To help identify remaining crashes now and in the future, I have made the ...

chrome/browser/ui/views/default_search_view.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_DEFAULT_SEARCH_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_DEFAULT_SEARCH_VIEW_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 31 matching lines @@
   // Takes ownership of |proposed_default_turl|.
   static void Show(TabContents* tab_contents,
                    TemplateURL* ,
                    TemplateURLService* template_url_service);
 
   virtual ~DefaultSearchView();
 
  protected:
   // Overridden from views::View:
   // Draws the gray background at the top of the dialog.
-  virtual void OnPaint(gfx::Canvas* canvas);
+  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
 
   // Overridden from views::ButtonListener:
-  virtual void ButtonPressed(views::Button* sender, const views::Event& event);
+  virtual void ButtonPressed(views::Button* sender,
+                             const views::Event& event) OVERRIDE;
 
   // ConstrainedDialogDelegate:
-  virtual std::wstring GetWindowTitle() const;
-  virtual views::View* GetInitiallyFocusedView();
-  virtual views::View* GetContentsView();
-  virtual int GetDialogButtons() const;
-  virtual bool Accept();
+  virtual std::wstring GetWindowTitle() const OVERRIDE;
+  virtual views::View* GetInitiallyFocusedView() OVERRIDE;
+  virtual views::View* GetContentsView() OVERRIDE;
+  virtual int GetDialogButtons() const OVERRIDE;
+  virtual bool Accept() OVERRIDE;
+  virtual views::Widget* GetWidget() OVERRIDE;
+  virtual const views::Widget* GetWidget() const OVERRIDE;

[Nico, 2011/06/17 03:48:15]

Hi Ben,

you added a "TODO: Find out why clang doesn't like these OVERRIDEs in
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/ui/views/defau...
".

The reason is that ConstrainedDialogDelegate is only a typef for
views::DialogDelegate – on CrOS, it's a typedef for ConstrainedWindowGtkDelegate
instead (see
http://codesearch.google.com/codesearch#OAMlx_jo-ck/src/content/browser/tab_c...
). That seems at best confusing and at worst bug-introducing, so it should maybe
be changed. I don't know this code well enough to know what the right thing is.

(ConstrainedWindowGtkDelegate is here:
http://codesearch.google.com/codesearch#OAMlx_jo-ck/src/chrome/browser/ui/gtk...
I'm not sure why this compiles as is; I guess on ChromeOS nothing tries to
create an instance of DefaultSearchView.)

 
  private:
   // Takes ownership of |proposed_default_turl|.
   DefaultSearchView(TabContents* tab_contents,
                     TemplateURL* proposed_default_turl,
                     TemplateURLService* template_url_service);
 
   // Initializes the labels and controls in the view.
   void SetupControls(PrefService* prefs);
 
   // Image of browser search box with grey background and bubble arrow.
   views::ImageView* background_image_;
 
   // Button for the current default search engine.
   views::View* default_provider_button_;
 
   // Button for the newly proposed search engine.
   views::View* proposed_provider_button_;
 
   // The proposed new default search engine.
   scoped_ptr<TemplateURL> proposed_turl_;
 
   TemplateURLService* template_url_service_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultSearchView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_DEFAULT_SEARCH_VIEW_H_