diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /chrome/browser/chromeos/frame/panel_browser_view.cc | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/browser/chromeos/frame/panel_browser_view.cc')
| -rw-r--r-- | chrome/browser/chromeos/frame/panel_browser_view.cc | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/chrome/browser/chromeos/frame/panel_browser_view.cc b/chrome/browser/chromeos/frame/panel_browser_view.cc index e91d51f..a7f075a 100644 --- a/chrome/browser/chromeos/frame/panel_browser_view.cc +++ b/chrome/browser/chromeos/frame/panel_browser_view.cc @@ -55,24 +55,6 @@ void PanelBrowserView::LimitBounds(gfx::Rect* bounds) const { //////////////////////////////////////////////////////////////////////////////// // BrowserView overrides. -void PanelBrowserView::Init() { - ::BrowserView::Init(); - // The visibility of toolbar is controlled in - // the BrowserView::IsToolbarVisible method. - - views::Window* window = frame()->GetWindow(); - gfx::NativeWindow native_window = window->GetNativeWindow(); - // The window manager needs the min size for popups. - gfx::Rect bounds = window->GetBounds(); - LimitBounds(&bounds); - gtk_widget_set_size_request( - GTK_WIDGET(native_window), bounds.width(), bounds.height()); - // If we don't explicitly resize here there is a race condition between - // the X Server and the window manager. Windows will appear with a default - // size of 200x200 if this happens. - gtk_window_resize(native_window, bounds.width(), bounds.height()); -} - void PanelBrowserView::Show() { if (panel_controller_.get() == NULL) { panel_controller_.reset(new PanelController(this, GetNativeHandle())); |
