Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(536)

Side by Side Diff: views/desktop/desktop_window_view.cc

Issue 7790010: Revert 98679 - Restoring a session should restore window minimization state on Windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « views/desktop/desktop_views_delegate.cc ('k') | views/test/test_views_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "views/desktop/desktop_window_view.h" 5 #include "views/desktop/desktop_window_view.h"
6 6
7 #include "ui/gfx/canvas.h" 7 #include "ui/gfx/canvas.h"
8 #include "ui/gfx/transform.h" 8 #include "ui/gfx/transform.h"
9 #include "views/desktop/desktop_background.h" 9 #include "views/desktop/desktop_background.h"
10 #include "views/desktop/desktop_window_manager.h" 10 #include "views/desktop/desktop_window_manager.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 // window, so we need to construct a NativeWidgetWin by hand. 128 // window, so we need to construct a NativeWidgetWin by hand.
129 // TODO(beng): Replace this with NativeWindow::CreateNativeRootWindow(). 129 // TODO(beng): Replace this with NativeWindow::CreateNativeRootWindow().
130 #if defined(USE_AURA) 130 #if defined(USE_AURA)
131 params.native_widget = new views::NativeWidgetAura(window); 131 params.native_widget = new views::NativeWidgetAura(window);
132 #elif defined(OS_WIN) 132 #elif defined(OS_WIN)
133 params.native_widget = new views::NativeWidgetWin(window); 133 params.native_widget = new views::NativeWidgetWin(window);
134 #elif defined(USE_WAYLAND) 134 #elif defined(USE_WAYLAND)
135 params.native_widget = new views::NativeWidgetWayland(window); 135 params.native_widget = new views::NativeWidgetWayland(window);
136 #elif defined(TOOLKIT_USES_GTK) 136 #elif defined(TOOLKIT_USES_GTK)
137 params.native_widget = new views::NativeWidgetGtk(window); 137 params.native_widget = new views::NativeWidgetGtk(window);
138 params.show_state = ui::SHOW_STATE_MAXIMIZED; 138 params.maximize = true;
139 #endif 139 #endif
140 params.bounds = gfx::Rect(20, 20, 1920, 1200); 140 params.bounds = gfx::Rect(20, 20, 1920, 1200);
141 window->Init(params); 141 window->Init(params);
142 window->Show(); 142 window->Show();
143 } 143 }
144 144
145 void DesktopWindowView::CreateTestWindow(const std::wstring& title, 145 void DesktopWindowView::CreateTestWindow(const std::wstring& title,
146 SkColor color, 146 SkColor color,
147 gfx::Rect initial_bounds, 147 gfx::Rect initial_bounds,
148 bool rotate) { 148 bool rotate) {
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 return NULL; 228 return NULL;
229 229
230 case DESKTOP_OTHER: 230 case DESKTOP_OTHER:
231 return new NativeFrameView(widget_); 231 return new NativeFrameView(widget_);
232 } 232 }
233 return NULL; 233 return NULL;
234 } 234 }
235 235
236 } // namespace desktop 236 } // namespace desktop
237 } // namespace views 237 } // namespace views
OLDNEW
« no previous file with comments | « views/desktop/desktop_views_delegate.cc ('k') | views/test/test_views_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698