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

Side by Side Diff: third_party/mojo_services/src/view_manager/public/cpp/lib/view.cc

Issue 890843003: Revert of Update mojo sdk to rev 8af2ccff2eee4bfca1043015abee30482a030b30 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
OLDNEW
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
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 // TODO(vtl): The |.Pass()| below is only needed due to an MSVS bug; remove it
391 // once that's fixed.
392 return metrics.Pass(); 390 return metrics.Pass();
393 } 391 }
394 392
395 } // namespace 393 } // namespace
396 394
397 View::View() 395 View::View()
398 : manager_(NULL), 396 : manager_(NULL),
399 id_(static_cast<Id>(-1)), 397 id_(static_cast<Id>(-1)),
400 parent_(NULL), 398 parent_(NULL),
401 viewport_metrics_(CreateEmptyViewportMetrics()), 399 viewport_metrics_(CreateEmptyViewportMetrics()),
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 void View::NotifyViewVisibilityChangedUp(View* target) { 567 void View::NotifyViewVisibilityChangedUp(View* target) {
570 // Start with the parent as we already notified |this| 568 // Start with the parent as we already notified |this|
571 // in NotifyViewVisibilityChangedDown. 569 // in NotifyViewVisibilityChangedDown.
572 for (View* view = parent(); view; view = view->parent()) { 570 for (View* view = parent(); view; view = view->parent()) {
573 bool ret = view->NotifyViewVisibilityChangedAtReceiver(target); 571 bool ret = view->NotifyViewVisibilityChangedAtReceiver(target);
574 DCHECK(ret); 572 DCHECK(ret);
575 } 573 }
576 } 574 }
577 575
578 } // namespace mojo 576 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698