| OLD | NEW |
| 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/window.h" | 5 #include "ui/aura/window.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
| (...skipping 690 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 701 | 701 |
| 702 void Window::NotifyAddedToRootWindow() { | 702 void Window::NotifyAddedToRootWindow() { |
| 703 FOR_EACH_OBSERVER(WindowObserver, observers_, | 703 FOR_EACH_OBSERVER(WindowObserver, observers_, |
| 704 OnWindowAddedToRootWindow(this)); | 704 OnWindowAddedToRootWindow(this)); |
| 705 for (Window::Windows::const_iterator it = children_.begin(); | 705 for (Window::Windows::const_iterator it = children_.begin(); |
| 706 it != children_.end(); ++it) { | 706 it != children_.end(); ++it) { |
| 707 (*it)->NotifyAddedToRootWindow(); | 707 (*it)->NotifyAddedToRootWindow(); |
| 708 } | 708 } |
| 709 } | 709 } |
| 710 | 710 |
| 711 void Window::OnPaintLayer(gfx::Canvas* canvas) { | 711 void Window::OnPaintLayer(gfx::CanvasSkia* canvas) { |
| 712 if (delegate_) | 712 if (delegate_) |
| 713 delegate_->OnPaint(canvas); | 713 delegate_->OnPaint(canvas); |
| 714 } | 714 } |
| 715 | 715 |
| 716 void Window::UpdateLayerName(const std::string& name) { | 716 void Window::UpdateLayerName(const std::string& name) { |
| 717 #if !defined(NDEBUG) | 717 #if !defined(NDEBUG) |
| 718 DCHECK(layer()); | 718 DCHECK(layer()); |
| 719 | 719 |
| 720 std::string layer_name(name_); | 720 std::string layer_name(name_); |
| 721 if (layer_name.empty()) | 721 if (layer_name.empty()) |
| (...skipping 13 matching lines...) Expand all Loading... |
| 735 parent_->children().end(), | 735 parent_->children().end(), |
| 736 this); | 736 this); |
| 737 for (++i; i != parent_->children().end(); ++i) { | 737 for (++i; i != parent_->children().end(); ++i) { |
| 738 if ((*i)->StopsEventPropagation()) | 738 if ((*i)->StopsEventPropagation()) |
| 739 return true; | 739 return true; |
| 740 } | 740 } |
| 741 return false; | 741 return false; |
| 742 } | 742 } |
| 743 | 743 |
| 744 } // namespace aura | 744 } // namespace aura |
| OLD | NEW |