diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-26 17:43:05 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-26 17:43:05 +0000 |
| commit | af1fde05ba3696986ba28445ea0c74f96d456ebb (patch) | |
| tree | 8986d27bfec650d279fa085767279a59442c6eaf /chrome/browser/first_run | |
| parent | a6ea9c6010cfa383356c3e84c2976132ce22c9d1 (diff) | |
| download | chromium_src-af1fde05ba3696986ba28445ea0c74f96d456ebb.zip chromium_src-af1fde05ba3696986ba28445ea0c74f96d456ebb.tar.gz chromium_src-af1fde05ba3696986ba28445ea0c74f96d456ebb.tar.bz2 | |
Rework the way Widget::Init works:
- Remove SetCreateParams from the public Widget API.
- Add parent/bounds fields to CreateParams
- Make Widget::Init be the canonical init method (vs. WidgetWin/Gtk Init) and have it take a CreateParams.
- NativeWidget now has a InitNativeWidget method, which subclasses can override. Everyone must call Widget::Init via Widget* (not WidgetWin* as this will be ambiguous to WindowImpl::Init).
BUG=72040
TEST=none
Review URL: http://codereview.chromium.org/6881107
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83037 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/first_run')
| -rw-r--r-- | chrome/browser/first_run/try_chrome_dialog_view.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/first_run/try_chrome_dialog_view.cc b/chrome/browser/first_run/try_chrome_dialog_view.cc index d9b3d88..47c9996 100644 --- a/chrome/browser/first_run/try_chrome_dialog_view.cc +++ b/chrome/browser/first_run/try_chrome_dialog_view.cc @@ -65,16 +65,16 @@ TryChromeDialogView::Result TryChromeDialogView::ShowModal( gfx::Size icon_size = icon->GetPreferredSize(); // An approximate window size. After Layout() we'll get better bounds. - views::Widget::CreateParams params(views::Widget::CreateParams::TYPE_POPUP); - params.can_activate = true; - popup_ = views::Widget::CreateWidget(params); + popup_ = views::Widget::CreateWidget(); if (!popup_) { NOTREACHED(); return DIALOG_ERROR; } - gfx::Rect pos(310, 160); - popup_->Init(NULL, pos); + views::Widget::CreateParams params(views::Widget::CreateParams::TYPE_POPUP); + params.can_activate = true; + params.bounds = gfx::Rect(310, 160); + popup_->Init(params); views::RootView* root_view = popup_->GetRootView(); // The window color is a tiny bit off-white. @@ -194,8 +194,8 @@ TryChromeDialogView::Result TryChromeDialogView::ShowModal( // account the differences between XP and Vista fonts and buttons. layout->Layout(root_view); gfx::Size preferred = layout->GetPreferredSize(root_view); - pos = ComputeWindowPosition(preferred.width(), preferred.height(), - base::i18n::IsRTL()); + gfx::Rect pos = ComputeWindowPosition(preferred.width(), preferred.height(), + base::i18n::IsRTL()); popup_->SetBounds(pos); // Carve the toast shape into the window. |