diff options
author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-19 18:15:12 +0000 |
---|---|---|
committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-19 18:15:12 +0000 |
commit | 3755e1716afea20576580302075dcb6ddb674e1d (patch) | |
tree | 9491adaff24ec157e0f6182ec73f488d975af3e3 /ui/aura/window.cc | |
parent | 835e98e142061272a6c46dfc73626ba3f8f64caa (diff) | |
download | chromium_src-3755e1716afea20576580302075dcb6ddb674e1d.zip chromium_src-3755e1716afea20576580302075dcb6ddb674e1d.tar.gz chromium_src-3755e1716afea20576580302075dcb6ddb674e1d.tar.bz2 |
Revert 258004 "Reset owner upon acquisition"
> Reset owner upon acquisition
>
> BUG=351463
> TEST=WindowTest.AcquireLayer, WindowUtilTest.RecreaetLayers
>
> Review URL: https://codereview.chromium.org/202163003
TBR=oshima@chromium.org
Review URL: https://codereview.chromium.org/203863004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258040 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/window.cc')
-rw-r--r-- | ui/aura/window.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/aura/window.cc b/ui/aura/window.cc index 806abb1..c55651b 100644 --- a/ui/aura/window.cc +++ b/ui/aura/window.cc @@ -1418,7 +1418,7 @@ void Window::UpdateLayerName(const std::string& name) { #if !defined(NDEBUG) DCHECK(layer()); - std::string layer_name(name); + std::string layer_name(name_); if (layer_name.empty()) layer_name = "Unnamed Window"; |