| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "view_manager/public/cpp/view.h" | 5 #include "view_manager/public/cpp/view.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "mojo/public/cpp/application/service_provider_impl.h" | 10 #include "mojo/public/cpp/application/service_provider_impl.h" |
| (...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 380 } | 380 } |
| 381 | 381 |
| 382 //////////////////////////////////////////////////////////////////////////////// | 382 //////////////////////////////////////////////////////////////////////////////// |
| 383 // View, protected: | 383 // View, protected: |
| 384 | 384 |
| 385 namespace { | 385 namespace { |
| 386 | 386 |
| 387 ViewportMetricsPtr CreateEmptyViewportMetrics() { | 387 ViewportMetricsPtr CreateEmptyViewportMetrics() { |
| 388 ViewportMetricsPtr metrics = ViewportMetrics::New(); | 388 ViewportMetricsPtr metrics = ViewportMetrics::New(); |
| 389 metrics->size = Size::New(); | 389 metrics->size = Size::New(); |
| 390 return metrics; | 390 // TODO(vtl): The |.Pass()| below is only needed due to an MSVS bug; remove it |
| 391 // once that's fixed. |
| 392 return metrics.Pass(); |
| 391 } | 393 } |
| 392 } | 394 |
| 395 } // namespace |
| 393 | 396 |
| 394 View::View() | 397 View::View() |
| 395 : manager_(NULL), | 398 : manager_(NULL), |
| 396 id_(static_cast<Id>(-1)), | 399 id_(static_cast<Id>(-1)), |
| 397 parent_(NULL), | 400 parent_(NULL), |
| 398 viewport_metrics_(CreateEmptyViewportMetrics()), | 401 viewport_metrics_(CreateEmptyViewportMetrics()), |
| 399 visible_(true), | 402 visible_(true), |
| 400 drawn_(false) { | 403 drawn_(false) { |
| 401 } | 404 } |
| 402 | 405 |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 566 void View::NotifyViewVisibilityChangedUp(View* target) { | 569 void View::NotifyViewVisibilityChangedUp(View* target) { |
| 567 // Start with the parent as we already notified |this| | 570 // Start with the parent as we already notified |this| |
| 568 // in NotifyViewVisibilityChangedDown. | 571 // in NotifyViewVisibilityChangedDown. |
| 569 for (View* view = parent(); view; view = view->parent()) { | 572 for (View* view = parent(); view; view = view->parent()) { |
| 570 bool ret = view->NotifyViewVisibilityChangedAtReceiver(target); | 573 bool ret = view->NotifyViewVisibilityChangedAtReceiver(target); |
| 571 DCHECK(ret); | 574 DCHECK(ret); |
| 572 } | 575 } |
| 573 } | 576 } |
| 574 | 577 |
| 575 } // namespace mojo | 578 } // namespace mojo |
| OLD | NEW |