Chromium Code Reviews| Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc |
| diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc |
| index e1b03bf712757295903be7e180e79d96b45327cd..dd24bcc1130b4e57549eef20a6f0598d97453a2d 100644 |
| --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc |
| +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc |
| @@ -676,6 +676,11 @@ gfx::Rect DesktopNativeWidgetAura::GetRestoredBounds() const { |
| desktop_window_tree_host_->GetRestoredBounds() : gfx::Rect(); |
| } |
| +std::string DesktopNativeWidgetAura::GetWorkspace() const { |
| + return content_window_ ? |
| + desktop_window_tree_host_->GetWorkspace() : ""; |
|
sky
2016/05/03 17:40:53
std::string()
Tom (Use chromium acct)
2016/05/03 19:38:39
Done.
|
| +} |
| + |
| void DesktopNativeWidgetAura::SetBounds(const gfx::Rect& bounds) { |
| if (!content_window_) |
| return; |
| @@ -1157,6 +1162,11 @@ void DesktopNativeWidgetAura::OnHostResized(const aura::WindowTreeHost* host) { |
| native_widget_delegate_->OnNativeWidgetSizeChanged(new_bounds.size()); |
| } |
| +void DesktopNativeWidgetAura::OnHostWorkspaceChanged( |
| + const aura::WindowTreeHost* host) { |
| + native_widget_delegate_->OnNativeWidgetWorkspaceChanged(); |
| +} |
| + |
| void DesktopNativeWidgetAura::OnHostMoved(const aura::WindowTreeHost* host, |
| const gfx::Point& new_origin) { |
| TRACE_EVENT1("views", "DesktopNativeWidgetAura::OnHostMoved", |