| Index: chrome/browser/ui/views/frame/browser_view.cc
|
| diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
|
| index 59c87a70eecd133d919c5d0e87d76979872478c9..6dc470d9001db8e521e08cfc9bc140902b718578 100644
|
| --- a/chrome/browser/ui/views/frame/browser_view.cc
|
| +++ b/chrome/browser/ui/views/frame/browser_view.cc
|
| @@ -790,9 +790,7 @@ bool BrowserView::IsMaximized() const {
|
| }
|
|
|
| bool BrowserView::IsMinimized() const {
|
| - // TODO(dhollowa): Add support for session restore of minimized state.
|
| - // http://crbug.com/43274
|
| - return false;
|
| + return frame_->IsMinimized();
|
| }
|
|
|
| void BrowserView::SetFullscreen(bool fullscreen) {
|
| @@ -1634,18 +1632,13 @@ std::wstring BrowserView::GetWindowName() const {
|
| }
|
|
|
| void BrowserView::SaveWindowPlacement(const gfx::Rect& bounds,
|
| - bool maximized) {
|
| - // TODO(dhollowa): Add support for session restore of minimized state.
|
| - // http://crbug.com/43274
|
| -
|
| + ui::WindowShowState show_state) {
|
| // If IsFullscreen() is true, we've just changed into fullscreen mode, and
|
| // we're catching the going-into-fullscreen sizing and positioning calls,
|
| // which we want to ignore.
|
| if (!IsFullscreen() && browser_->ShouldSaveWindowPlacement()) {
|
| - WidgetDelegate::SaveWindowPlacement(bounds, maximized);
|
| - browser_->SaveWindowPlacement(bounds,
|
| - maximized ? ui::SHOW_STATE_MAXIMIZED :
|
| - ui::SHOW_STATE_NORMAL);
|
| + WidgetDelegate::SaveWindowPlacement(bounds, show_state);
|
| + browser_->SaveWindowPlacement(bounds, show_state);
|
| }
|
| }
|
|
|
| @@ -1688,10 +1681,9 @@ bool BrowserView::GetSavedWindowBounds(gfx::Rect* bounds) const {
|
| return true;
|
| }
|
|
|
| -bool BrowserView::GetSavedMaximizedState(bool* maximized) const {
|
| - // TODO(dhollowa): Add support for session restore of minimized state.
|
| - // http://crbug.com/43274
|
| - *maximized = browser_->GetSavedWindowShowState() == ui::SHOW_STATE_MAXIMIZED;
|
| +bool BrowserView::GetSavedWindowShowState(
|
| + ui::WindowShowState* show_state) const {
|
| + *show_state = browser_->GetSavedWindowShowState();
|
| return true;
|
| }
|
|
|
|
|