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

Unified Diff: chrome/browser/sessions/session_restore.cc

Issue 24108003: [Cleanup] Rename WindowSettings to WindowState (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase fix Created 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sessions/session_restore.cc
diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc
index 27c1084267ce581181b83c13022dfa74a6842bfc..9a9d29883a01f53e800681e19a24d1a79adee3b1 100644
--- a/chrome/browser/sessions/session_restore.cc
+++ b/chrome/browser/sessions/session_restore.cc
@@ -59,7 +59,7 @@
#endif
#if defined(USE_ASH)
-#include "ash/wm/window_settings.h"
+#include "ash/wm/window_state.h"
#endif
using content::NavigationController;
using content::RenderWidgetHost;
@@ -1087,12 +1087,12 @@ class SessionRestoreImpl : public content::NotificationObserver {
#if defined(USE_ASH)
// Prevent the auto window management for this window on show.
- ash::wm::GetWindowSettings(browser->window()->GetNativeWindow())->
+ ash::wm::GetWindowState(browser->window()->GetNativeWindow())->
set_bounds_changed_by_user(true);
#endif
browser->window()->Show();
#if defined(USE_ASH)
- ash::wm::GetWindowSettings(browser->window()->GetNativeWindow())->
+ ash::wm::GetWindowState(browser->window()->GetNativeWindow())->
set_bounds_changed_by_user(false);
#endif
browser->set_is_session_restore(false);
« no previous file with comments | « chrome/browser/extensions/api/app_window/app_window_api.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698