| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "ash/aura/wm_window_aura.h" | 5 #include "ash/aura/wm_window_aura.h" |
| 6 | 6 |
| 7 #include "ash/aura/aura_layout_manager_adapter.h" | 7 #include "ash/aura/aura_layout_manager_adapter.h" |
| 8 #include "ash/aura/wm_root_window_controller_aura.h" | 8 #include "ash/aura/wm_root_window_controller_aura.h" |
| 9 #include "ash/aura/wm_shell_aura.h" | 9 #include "ash/aura/wm_shell_aura.h" |
| 10 #include "ash/common/ash_constants.h" | 10 #include "ash/common/ash_constants.h" |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 152 | 152 |
| 153 WmShell* WmWindowAura::GetShell() const { | 153 WmShell* WmWindowAura::GetShell() const { |
| 154 return WmShell::Get(); | 154 return WmShell::Get(); |
| 155 } | 155 } |
| 156 | 156 |
| 157 void WmWindowAura::SetName(const char* name) { | 157 void WmWindowAura::SetName(const char* name) { |
| 158 window_->SetName(name); | 158 window_->SetName(name); |
| 159 } | 159 } |
| 160 | 160 |
| 161 std::string WmWindowAura::GetName() const { | 161 std::string WmWindowAura::GetName() const { |
| 162 return window_->name(); | 162 return window_->GetName(); |
| 163 } | 163 } |
| 164 | 164 |
| 165 void WmWindowAura::SetTitle(const base::string16& title) { | 165 void WmWindowAura::SetTitle(const base::string16& title) { |
| 166 window_->SetTitle(title); | 166 window_->SetTitle(title); |
| 167 } | 167 } |
| 168 | 168 |
| 169 base::string16 WmWindowAura::GetTitle() const { | 169 base::string16 WmWindowAura::GetTitle() const { |
| 170 return window_->title(); | 170 return window_->GetTitle(); |
| 171 } | 171 } |
| 172 | 172 |
| 173 void WmWindowAura::SetShellWindowId(int id) { | 173 void WmWindowAura::SetShellWindowId(int id) { |
| 174 window_->set_id(id); | 174 window_->set_id(id); |
| 175 } | 175 } |
| 176 | 176 |
| 177 int WmWindowAura::GetShellWindowId() const { | 177 int WmWindowAura::GetShellWindowId() const { |
| 178 return window_->id(); | 178 return window_->id(); |
| 179 } | 179 } |
| 180 | 180 |
| (...skipping 763 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 944 observer.OnTransientChildAdded(this, Get(transient)); | 944 observer.OnTransientChildAdded(this, Get(transient)); |
| 945 } | 945 } |
| 946 | 946 |
| 947 void WmWindowAura::OnTransientChildRemoved(aura::Window* window, | 947 void WmWindowAura::OnTransientChildRemoved(aura::Window* window, |
| 948 aura::Window* transient) { | 948 aura::Window* transient) { |
| 949 for (auto& observer : transient_observers_) | 949 for (auto& observer : transient_observers_) |
| 950 observer.OnTransientChildRemoved(this, Get(transient)); | 950 observer.OnTransientChildRemoved(this, Get(transient)); |
| 951 } | 951 } |
| 952 | 952 |
| 953 } // namespace ash | 953 } // namespace ash |
| OLD | NEW |