diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-25 22:19:13 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-25 22:19:13 +0000 |
| commit | 4e6d999a7d302b751871d23308e9174ec3b8805c (patch) | |
| tree | 6c53662edd1bb2b50d72696abf0eff47a0854696 /chrome/browser/gtk | |
| parent | 7bc4f7095ca7965c555b7c7c15570a443f4b3bcd (diff) | |
| download | chromium_src-4e6d999a7d302b751871d23308e9174ec3b8805c.zip chromium_src-4e6d999a7d302b751871d23308e9174ec3b8805c.tar.gz chromium_src-4e6d999a7d302b751871d23308e9174ec3b8805c.tar.bz2 | |
A change to make popups work correctly in the GTK build broke
Chrome OS panels...this fixes them.
Review URL: http://codereview.chromium.org/242011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27263 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk')
| -rw-r--r-- | chrome/browser/gtk/browser_window_gtk.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc index 5fde606..cdeafc0 100644 --- a/chrome/browser/gtk/browser_window_gtk.cc +++ b/chrome/browser/gtk/browser_window_gtk.cc @@ -818,12 +818,18 @@ void BrowserWindowGtk::SetBoundsImpl(const gfx::Rect& bounds, bool exterior) { gtk_window_move(window_, x, y); +#if defined(OS_CHROMEOS) + // In Chrome OS we need to get the popup size set here for the panel + // to be displayed with its initial size correctly. + SetWindowSize(window_, width, height); +#else if (exterior) { SetWindowSize(window_, width, height); } else { gtk_widget_set_size_request(contents_container_->widget(), width, height); } +#endif } void BrowserWindowGtk::SetBounds(const gfx::Rect& bounds) { |