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

Side by Side Diff: mojo/services/public/cpp/view_manager/lib/node.cc

Issue 372163005: Fixes for re-enabling more MSVC level 4 warnings: mojo/ edition (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review comments Created 6 years, 5 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 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 "mojo/services/public/cpp/view_manager/node.h" 5 #include "mojo/services/public/cpp/view_manager/node.h"
6 6
7 #include "mojo/services/public/cpp/view_manager/lib/node_private.h" 7 #include "mojo/services/public/cpp/view_manager/lib/node_private.h"
8 #include "mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h" 8 #include "mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h"
9 #include "mojo/services/public/cpp/view_manager/lib/view_private.h" 9 #include "mojo/services/public/cpp/view_manager/lib/view_private.h"
10 #include "mojo/services/public/cpp/view_manager/node_observer.h" 10 #include "mojo/services/public/cpp/view_manager/node_observer.h"
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 365
366 void Node::Embed(const String& url) { 366 void Node::Embed(const String& url) {
367 static_cast<ViewManagerClientImpl*>(manager_)->Embed(url, id_); 367 static_cast<ViewManagerClientImpl*>(manager_)->Embed(url, id_);
368 } 368 }
369 369
370 //////////////////////////////////////////////////////////////////////////////// 370 ////////////////////////////////////////////////////////////////////////////////
371 // Node, protected: 371 // Node, protected:
372 372
373 Node::Node() 373 Node::Node()
374 : manager_(NULL), 374 : manager_(NULL),
375 id_(-1), 375 id_(static_cast<Id>(-1)),
376 parent_(NULL), 376 parent_(NULL),
377 active_view_(NULL) {} 377 active_view_(NULL) {}
378 378
379 Node::~Node() { 379 Node::~Node() {
380 ScopedDestructionNotifier notifier(this); 380 ScopedDestructionNotifier notifier(this);
381 if (parent_) 381 if (parent_)
382 parent_->LocalRemoveChild(this); 382 parent_->LocalRemoveChild(this);
383 // TODO(beng): It'd be better to do this via a destruction observer in the 383 // TODO(beng): It'd be better to do this via a destruction observer in the
384 // ViewManagerClientImpl. 384 // ViewManagerClientImpl.
385 if (manager_) 385 if (manager_)
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 428
429 void Node::LocalSetBounds(const gfx::Rect& old_bounds, 429 void Node::LocalSetBounds(const gfx::Rect& old_bounds,
430 const gfx::Rect& new_bounds) { 430 const gfx::Rect& new_bounds) {
431 DCHECK(old_bounds == bounds_); 431 DCHECK(old_bounds == bounds_);
432 ScopedSetBoundsNotifier notifier(this, old_bounds, new_bounds); 432 ScopedSetBoundsNotifier notifier(this, old_bounds, new_bounds);
433 bounds_ = new_bounds; 433 bounds_ = new_bounds;
434 } 434 }
435 435
436 } // namespace view_manager 436 } // namespace view_manager
437 } // namespace mojo 437 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698