diff options
Diffstat (limited to 'chromium/ui/aura/window.h')
| -rw-r--r-- | chromium/ui/aura/window.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/chromium/ui/aura/window.h b/chromium/ui/aura/window.h index 05874dea71d..6251d9a30e8 100644 --- a/chromium/ui/aura/window.h +++ b/chromium/ui/aura/window.h @@ -13,9 +13,9 @@ #include <string> #include <vector> +#include "base/check.h" #include "base/compiler_specific.h" #include "base/containers/flat_set.h" -#include "base/logging.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" @@ -193,9 +193,9 @@ class AURA_EXPORT Window : public ui::LayerDelegate, const Window* parent() const { return parent_; } // Returns the root Window that contains this Window. The root Window is - // defined as the Window that has a dispatcher. These functions return NULL if - // the Window is contained in a hierarchy that does not have a dispatcher at - // its root. + // defined as the Window that has a dispatcher. These functions return nullptr + // if the Window is contained in a hierarchy that does not have a dispatcher + // at its root. Window* GetRootWindow(); const Window* GetRootWindow() const; @@ -278,7 +278,7 @@ class AURA_EXPORT Window : public ui::LayerDelegate, void StackChildAtTop(Window* child); // Stacks |child| above |target|. Does nothing if |child| is already above - // |target|. Does not stack on top of windows with NULL layer delegates, + // |target|. Does not stack on top of windows with nullptr layer delegates, // see WindowTest.StackingMadrigal for details. void StackChildAbove(Window* child, Window* target); @@ -298,14 +298,14 @@ class AURA_EXPORT Window : public ui::LayerDelegate, // Returns true if this Window contains |other| somewhere in its children. bool Contains(const Window* other) const; - // Retrieves the first-level child with the specified id, or NULL if no first- - // level child is found matching |id|. + // Retrieves the first-level child with the specified id, or nullptr if no + // first- level child is found matching |id|. Window* GetChildById(int id); const Window* GetChildById(int id) const; // Converts |point| from |source|'s coordinates to |target|'s. If |source| is - // NULL, the function returns without modifying |point|. |target| cannot be - // NULL. + // nullptr, the function returns without modifying |point|. |target| cannot be + // nullptr. static void ConvertPointToTarget(const Window* source, const Window* target, gfx::PointF* point); |