diff options
author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-20 20:33:15 +0000 |
---|---|---|
committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-20 20:33:15 +0000 |
commit | 0b620355c963651dd048f4d0bef3ba7b307abc56 (patch) | |
tree | fa6fae9b6a6bc4bcd28a514b849716acff3acae8 /ui | |
parent | e14b9bc7a5ac7e0de2794a7ec24afc76b544c9e1 (diff) | |
download | chromium_src-0b620355c963651dd048f4d0bef3ba7b307abc56.zip chromium_src-0b620355c963651dd048f4d0bef3ba7b307abc56.tar.gz chromium_src-0b620355c963651dd048f4d0bef3ba7b307abc56.tar.bz2 |
Remove unnecessary argument in UpdateLayerName
BUG=none
R=sadrul@chromium.org
Review URL: https://codereview.chromium.org/206183008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258396 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r-- | ui/aura/window.cc | 6 | ||||
-rw-r--r-- | ui/aura/window.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ui/aura/window.cc b/ui/aura/window.cc index 40275c3..2d3300f 100644 --- a/ui/aura/window.cc +++ b/ui/aura/window.cc @@ -271,7 +271,7 @@ void Window::Init(WindowLayerType window_layer_type) { SetLayer(new ui::Layer(WindowLayerTypeToUILayerType(window_layer_type))); layer()->SetVisible(false); layer()->set_delegate(this); - UpdateLayerName(name_); + UpdateLayerName(); layer()->SetFillsBoundsOpaquely(!transparent_); } @@ -288,7 +288,7 @@ void Window::SetName(const std::string& name) { name_ = name; if (layer()) - UpdateLayerName(name_); + UpdateLayerName(); } void Window::SetTransparent(bool transparent) { @@ -1387,7 +1387,7 @@ void Window::ConvertEventToTarget(ui::EventTarget* target, static_cast<Window*>(target)); } -void Window::UpdateLayerName(const std::string& name) { +void Window::UpdateLayerName() { #if !defined(NDEBUG) DCHECK(layer()); diff --git a/ui/aura/window.h b/ui/aura/window.h index ec9215d..b508d35 100644 --- a/ui/aura/window.h +++ b/ui/aura/window.h @@ -464,8 +464,8 @@ class AURA_EXPORT Window : public ui::LayerDelegate, virtual void ConvertEventToTarget(ui::EventTarget* target, ui::LocatedEvent* event) OVERRIDE; - // Updates the layer name with a name based on the window's name and id. - void UpdateLayerName(const std::string& name); + // Updates the layer name based on the window's name and id. + void UpdateLayerName(); // Returns true if the mouse is currently within our bounds. bool ContainsMouse(); |