From 0f2f4b60511540e292e085ba5e1985be6bf93908 Mon Sep 17 00:00:00 2001 From: "beng@google.com" Date: Wed, 30 Jul 2008 04:12:18 +0000 Subject: Window Delegate Improvements: - Windows now must have a Delegate. Just construct the default WindowDelegate if you don't want to have to write one in testing. - Windows now obtain their contents view by asking the delegate via WindowDelegate::GetContentsView. - Contents views no longer need to manually store a pointer to the Window that contains them, WindowDelegate does this automatically via its window() accessor. Reviewer notes: - review window_delegate.h first, then - window.h/cc - custom frame window.h/cc - constrained_window_impl.h/cc - then everything else (just updating all call sites) B=1280060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/views/first_run_customize_view.h | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'chrome/browser/views/first_run_customize_view.h') diff --git a/chrome/browser/views/first_run_customize_view.h b/chrome/browser/views/first_run_customize_view.h index 4a22cb6..69cf46e 100644 --- a/chrome/browser/views/first_run_customize_view.h +++ b/chrome/browser/views/first_run_customize_view.h @@ -63,16 +63,11 @@ class FirstRunCustomizeView : public FirstRunViewBase, virtual void CustomizeCanceled() = 0; }; - FirstRunCustomizeView(Profile* profile, ImporterHost* importer_host); + FirstRunCustomizeView(Profile* profile, + ImporterHost* importer_host, + CustomizeViewObserver* observer); virtual ~FirstRunCustomizeView(); - void set_dialog(ChromeViews::Window* dialog) { dialog_ = dialog; } - - // Sets the object that receives UserAccept and UserCancel notifications. - void set_observer(CustomizeViewObserver* observer) { - customize_observer_ = observer; - }; - // Overridden from ChromeViews::View. virtual void GetPreferredSize(CSize *out); virtual void Layout(); @@ -90,13 +85,11 @@ class FirstRunCustomizeView : public FirstRunViewBase, // Overridden from ChromeViews::WindowDelegate. virtual std::wstring GetWindowTitle() const; - + virtual ChromeViews::View* GetContentsView(); // Yes, we're modal. // NOTE: if you change this you'll need to make sure it isn't possible to // close the window while importing. - virtual bool IsModal() const { - return true; - } + virtual bool IsModal() const { return true; } private: // Initializes the controls on the dialog. -- cgit v1.1