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

Side by Side Diff: ui/aura/root_window.cc

Issue 10444014: ash: Improved window maximize/restore animations (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix workspace mgr, remove ignore_window, cleanup Created 8 years, 6 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ui/aura/root_window.h" 5 #include "ui/aura/root_window.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 if (draw_on_compositing_end_) { 578 if (draw_on_compositing_end_) {
579 draw_on_compositing_end_ = false; 579 draw_on_compositing_end_ = false;
580 580
581 // Call ScheduleDraw() instead of Draw() in order to allow other 581 // Call ScheduleDraw() instead of Draw() in order to allow other
582 // ui::CompositorObservers to be notified before starting another 582 // ui::CompositorObservers to be notified before starting another
583 // draw cycle. 583 // draw cycle.
584 ScheduleDraw(); 584 ScheduleDraw();
585 } 585 }
586 } 586 }
587 587
588 void RootWindow::OnCompositingAborted(ui::Compositor*) {
589 }
590
588 //////////////////////////////////////////////////////////////////////////////// 591 ////////////////////////////////////////////////////////////////////////////////
589 // RootWindow, ui::LayerDelegate implementation: 592 // RootWindow, ui::LayerDelegate implementation:
590 void RootWindow::OnDeviceScaleFactorChanged( 593 void RootWindow::OnDeviceScaleFactorChanged(
591 float device_scale_factor) { 594 float device_scale_factor) {
592 if (cursor_shown_) 595 if (cursor_shown_)
593 ShowCursor(false); 596 ShowCursor(false);
594 host_->OnDeviceScaleFactorChanged(device_scale_factor); 597 host_->OnDeviceScaleFactorChanged(device_scale_factor);
595 Window::OnDeviceScaleFactorChanged(device_scale_factor); 598 Window::OnDeviceScaleFactorChanged(device_scale_factor);
596 if (cursor_shown_) 599 if (cursor_shown_)
597 ShowCursor(true); 600 ShowCursor(true);
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
1037 void RootWindow::UnlockCompositor() { 1040 void RootWindow::UnlockCompositor() {
1038 DCHECK(compositor_lock_); 1041 DCHECK(compositor_lock_);
1039 compositor_lock_ = NULL; 1042 compositor_lock_ = NULL;
1040 if (draw_on_compositor_unlock_) { 1043 if (draw_on_compositor_unlock_) {
1041 draw_on_compositor_unlock_ = false; 1044 draw_on_compositor_unlock_ = false;
1042 ScheduleDraw(); 1045 ScheduleDraw();
1043 } 1046 }
1044 } 1047 }
1045 1048
1046 } // namespace aura 1049 } // namespace aura
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698