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

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

Issue 9222018: reland -- Disable animations during aura tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 10 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 | « ui/aura/root_window.h ('k') | ui/aura/test/aura_test_base.cc » ('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) 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 <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 658 matching lines...) Expand 10 before | Expand all | Expand 10 after
669 669
670 bool RootWindow::CanReceiveEvents() const { 670 bool RootWindow::CanReceiveEvents() const {
671 return IsVisible(); 671 return IsVisible();
672 } 672 }
673 673
674 internal::FocusManager* RootWindow::GetFocusManager() { 674 internal::FocusManager* RootWindow::GetFocusManager() {
675 return this; 675 return this;
676 } 676 }
677 677
678 void RootWindow::OnLayerAnimationEnded( 678 void RootWindow::OnLayerAnimationEnded(
679 const ui::LayerAnimationSequence* animation) { 679 ui::LayerAnimationSequence* animation) {
680 OnHostResized(host_->GetSize()); 680 OnHostResized(host_->GetSize());
681 } 681 }
682 682
683 void RootWindow::OnLayerAnimationScheduled( 683 void RootWindow::OnLayerAnimationScheduled(
684 const ui::LayerAnimationSequence* animation) { 684 ui::LayerAnimationSequence* animation) {
685 } 685 }
686 686
687 void RootWindow::OnLayerAnimationAborted( 687 void RootWindow::OnLayerAnimationAborted(
688 const ui::LayerAnimationSequence* animation) { 688 ui::LayerAnimationSequence* animation) {
689 } 689 }
690 690
691 void RootWindow::SetFocusedWindow(Window* focused_window) { 691 void RootWindow::SetFocusedWindow(Window* focused_window) {
692 if (focused_window == focused_window_) 692 if (focused_window == focused_window_)
693 return; 693 return;
694 if (focused_window && !focused_window->CanFocus()) 694 if (focused_window && !focused_window->CanFocus())
695 return; 695 return;
696 // The NULL-check of |focused_window| is essential here before asking the 696 // The NULL-check of |focused_window| is essential here before asking the
697 // activation client, since it is valid to clear the focus by calling 697 // activation client, since it is valid to clear the focus by calling
698 // SetFocusedWindow() to NULL. 698 // SetFocusedWindow() to NULL.
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
771 // is currently broken. See/ crbug.com/107931. 771 // is currently broken. See/ crbug.com/107931.
772 MouseEvent event(ui::ET_MOUSE_MOVED, 772 MouseEvent event(ui::ET_MOUSE_MOVED,
773 orig_mouse_location, 773 orig_mouse_location,
774 orig_mouse_location, 774 orig_mouse_location,
775 0); 775 0);
776 DispatchMouseEvent(&event); 776 DispatchMouseEvent(&event);
777 #endif 777 #endif
778 } 778 }
779 779
780 } // namespace aura 780 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/root_window.h ('k') | ui/aura/test/aura_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698