diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-05 00:58:06 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-05 00:58:06 +0000 |
| commit | a55bfd3d8f23c22003cf6a0754aa320fe7b7d3e4 (patch) | |
| tree | f90c20acb5701e17d66fabfce5ca90c827ca9c2e /chrome/browser/chromeos | |
| parent | bd205617c4f7eca4bb28c0343ed2f071189393c3 (diff) | |
| download | chromium_src-a55bfd3d8f23c22003cf6a0754aa320fe7b7d3e4.zip chromium_src-a55bfd3d8f23c22003cf6a0754aa320fe7b7d3e4.tar.gz chromium_src-a55bfd3d8f23c22003cf6a0754aa320fe7b7d3e4.tar.bz2 | |
Add cross platform Widget::InitWithWidget(parent, const gfx::Rect& bounds);
On linux, native parent has to be either window_contents or widget depending of the type of wiget. InitWithWidget takes a parent Widget instead of native and hides these details.
I also cleaned up a few dead/duplicated code.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2355003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48990 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos')
| -rw-r--r-- | chrome/browser/chromeos/login/screen_locker.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc index 507f0fe..60540c7 100644 --- a/chrome/browser/chromeos/login/screen_locker.cc +++ b/chrome/browser/chromeos/login/screen_locker.cc @@ -181,11 +181,11 @@ void ScreenLocker::Init(const gfx::Rect& bounds) { lock_widget_ = new GrabWidget(); lock_widget_->MakeTransparent(); - lock_widget_->Init(lock_window_->window_contents(), - gfx::Rect((bounds.width() - size.width()) /2, - (bounds.height() - size.width()) /2, - size.width(), - size.height())); + lock_widget_->InitWithWidget(lock_window_, + gfx::Rect((bounds.width() - size.width()) / 2, + (bounds.height() - size.width()) / 2, + size.width(), + size.height())); lock_widget_->SetContentsView(screen_lock_view_); lock_widget_->Show(); screen_lock_view_->ClearAndSetFocusToPassword(); |