Commit 6184d10f authored by sky@chromium.org's avatar sky@chromium.org

Removes unused parameter from RootWindow::OnWindowHidden.

BUG=none
TEST=none

Review URL: https://chromiumcodereview.appspot.com/22325002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215849 0039d316-1c4b-4281-b951-d872f2087c98
parent cfe98c9e
...@@ -353,7 +353,7 @@ bool RootWindow::DispatchGestureEvent(ui::GestureEvent* event) { ...@@ -353,7 +353,7 @@ bool RootWindow::DispatchGestureEvent(ui::GestureEvent* event) {
void RootWindow::OnWindowDestroying(Window* window) { void RootWindow::OnWindowDestroying(Window* window) {
DispatchMouseExitToHidingWindow(window); DispatchMouseExitToHidingWindow(window);
OnWindowHidden(window, WINDOW_DESTROYED, NULL); OnWindowHidden(window, WINDOW_DESTROYED);
if (window->IsVisible() && if (window->IsVisible() &&
window->ContainsPointInRoot(GetLastMouseLocationInRoot())) { window->ContainsPointInRoot(GetLastMouseLocationInRoot())) {
...@@ -389,7 +389,7 @@ void RootWindow::DispatchMouseExitToHidingWindow(Window* window) { ...@@ -389,7 +389,7 @@ void RootWindow::DispatchMouseExitToHidingWindow(Window* window) {
void RootWindow::OnWindowVisibilityChanged(Window* window, bool is_visible) { void RootWindow::OnWindowVisibilityChanged(Window* window, bool is_visible) {
if (!is_visible) if (!is_visible)
OnWindowHidden(window, WINDOW_HIDDEN, NULL); OnWindowHidden(window, WINDOW_HIDDEN);
if (window->ContainsPointInRoot(GetLastMouseLocationInRoot())) if (window->ContainsPointInRoot(GetLastMouseLocationInRoot()))
PostMouseMoveEventAfterWindowChange(); PostMouseMoveEventAfterWindowChange();
...@@ -788,7 +788,7 @@ void RootWindow::OnWindowRemovedFromRootWindow(Window* detached, ...@@ -788,7 +788,7 @@ void RootWindow::OnWindowRemovedFromRootWindow(Window* detached,
DCHECK(aura::client::GetCaptureWindow(this) != this); DCHECK(aura::client::GetCaptureWindow(this) != this);
DispatchMouseExitToHidingWindow(detached); DispatchMouseExitToHidingWindow(detached);
OnWindowHidden(detached, new_root ? WINDOW_MOVING : WINDOW_HIDDEN, new_root); OnWindowHidden(detached, new_root ? WINDOW_MOVING : WINDOW_HIDDEN);
if (detached->IsVisible() && if (detached->IsVisible() &&
detached->ContainsPointInRoot(GetLastMouseLocationInRoot())) { detached->ContainsPointInRoot(GetLastMouseLocationInRoot())) {
...@@ -796,9 +796,7 @@ void RootWindow::OnWindowRemovedFromRootWindow(Window* detached, ...@@ -796,9 +796,7 @@ void RootWindow::OnWindowRemovedFromRootWindow(Window* detached,
} }
} }
void RootWindow::OnWindowHidden(Window* invisible, void RootWindow::OnWindowHidden(Window* invisible, WindowHiddenReason reason) {
WindowHiddenReason reason,
RootWindow* new_root) {
// TODO(beng): This should be removed once FocusController is turned on. // TODO(beng): This should be removed once FocusController is turned on.
if (client::GetFocusClient(this)) { if (client::GetFocusClient(this)) {
client::GetFocusClient(this)->OnWindowHiddenInRootWindow( client::GetFocusClient(this)->OnWindowHiddenInRootWindow(
......
...@@ -338,11 +338,8 @@ class AURA_EXPORT RootWindow : public ui::CompositorDelegate, ...@@ -338,11 +338,8 @@ class AURA_EXPORT RootWindow : public ui::CompositorDelegate,
// Called when a window becomes invisible, either by being removed // Called when a window becomes invisible, either by being removed
// from root window hierarchy, via SetVisible(false) or being destroyed. // from root window hierarchy, via SetVisible(false) or being destroyed.
// |reason| specifies what triggered the hiding. |new_root| is the new root // |reason| specifies what triggered the hiding.
// window, and may be NULL. void OnWindowHidden(Window* invisible, WindowHiddenReason reason);
void OnWindowHidden(Window* invisible,
WindowHiddenReason reason,
RootWindow* new_root);
// Cleans up the gesture recognizer for all windows in |window| (including // Cleans up the gesture recognizer for all windows in |window| (including
// |window| itself). // |window| itself).
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment