ash/shell/shell_delegate_impl.cc - Issue 24108003: [Cleanup] Rename WindowSettings to WindowState

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/shell/shell_delegate_impl.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:

Index: ash/shell/shell_delegate_impl.cc

diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc

index 58076ab75be985f43eb5e212d7e1426fc1a5b2f9..eb6839c40d9620226f974f680c5fc9fd5245e0af 100644

--- a/ash/shell/shell_delegate_impl.cc

+++ b/ash/shell/shell_delegate_impl.cc

@@ -17,7 +17,7 @@

#include "ash/shell/toplevel_window.h"

#include "ash/shell_window_ids.h"

#include "ash/system/tray/default_system_tray_delegate.h"

-#include "ash/wm/window_util.h"

+#include "ash/wm/window_state.h"

#include "base/message_loop/message_loop.h"

#include "ui/aura/window.h"

#include "ui/views/corewm/input_method_event_filter.h"

@@ -81,9 +81,9 @@ void ShellDelegateImpl::ToggleFullscreen() {

}

void ShellDelegateImpl::ToggleMaximized() {

- aura::Window* window = ash::wm::GetActiveWindow();

- if (window)

- ash::wm::ToggleMaximizedWindow(window);

+ wm::WindowState* window_state = wm::GetActiveWindowState();

+ if (window_state)

+ window_state->ToggleMaximized();

}

void ShellDelegateImpl::OpenFileManager(bool as_dialog) {

« no previous file with comments | « ash/shelf/shelf_widget.cc ('k') | ash/shell/toplevel_window.cc » ('j') | no next file with comments »