| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" | 5 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
| 9 #include "ui/aura/client/activation_client.h" | 9 #include "ui/aura/client/activation_client.h" |
| 10 #include "ui/aura/client/aura_constants.h" | 10 #include "ui/aura/client/aura_constants.h" |
| (...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 580 desktop_root_window_host_->CenterWindow(size); | 580 desktop_root_window_host_->CenterWindow(size); |
| 581 } | 581 } |
| 582 | 582 |
| 583 void DesktopNativeWidgetAura::GetWindowPlacement( | 583 void DesktopNativeWidgetAura::GetWindowPlacement( |
| 584 gfx::Rect* bounds, | 584 gfx::Rect* bounds, |
| 585 ui::WindowShowState* maximized) const { | 585 ui::WindowShowState* maximized) const { |
| 586 if (content_window_) | 586 if (content_window_) |
| 587 desktop_root_window_host_->GetWindowPlacement(bounds, maximized); | 587 desktop_root_window_host_->GetWindowPlacement(bounds, maximized); |
| 588 } | 588 } |
| 589 | 589 |
| 590 bool DesktopNativeWidgetAura::SetWindowTitle(const string16& title) { | 590 bool DesktopNativeWidgetAura::SetWindowTitle(const base::string16& title) { |
| 591 if (!content_window_) | 591 if (!content_window_) |
| 592 return false; | 592 return false; |
| 593 return desktop_root_window_host_->SetWindowTitle(title); | 593 return desktop_root_window_host_->SetWindowTitle(title); |
| 594 } | 594 } |
| 595 | 595 |
| 596 void DesktopNativeWidgetAura::SetWindowIcons(const gfx::ImageSkia& window_icon, | 596 void DesktopNativeWidgetAura::SetWindowIcons(const gfx::ImageSkia& window_icon, |
| 597 const gfx::ImageSkia& app_icon) { | 597 const gfx::ImageSkia& app_icon) { |
| 598 if (content_window_) | 598 if (content_window_) |
| 599 desktop_root_window_host_->SetWindowIcons(window_icon, app_icon); | 599 desktop_root_window_host_->SetWindowIcons(window_icon, app_icon); |
| 600 } | 600 } |
| (...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1116 input_method_event_filter_->SetInputMethodPropertyInRootWindow( | 1116 input_method_event_filter_->SetInputMethodPropertyInRootWindow( |
| 1117 root_window_->window()); | 1117 root_window_->window()); |
| 1118 root_window_event_filter_->AddHandler(input_method_event_filter_.get()); | 1118 root_window_event_filter_->AddHandler(input_method_event_filter_.get()); |
| 1119 } | 1119 } |
| 1120 | 1120 |
| 1121 void DesktopNativeWidgetAura::UpdateWindowTransparency() { | 1121 void DesktopNativeWidgetAura::UpdateWindowTransparency() { |
| 1122 content_window_->SetTransparent(ShouldUseNativeFrame()); | 1122 content_window_->SetTransparent(ShouldUseNativeFrame()); |
| 1123 } | 1123 } |
| 1124 | 1124 |
| 1125 } // namespace views | 1125 } // namespace views |
| OLD | NEW |