| 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/native_widget_aura.h" | 5 #include "ui/views/widget/native_widget_aura.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
| 9 #include "third_party/skia/include/core/SkRegion.h" | 9 #include "third_party/skia/include/core/SkRegion.h" |
| 10 #include "ui/aura/client/activation_client.h" | 10 #include "ui/aura/client/activation_client.h" |
| (...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 338 | 338 |
| 339 void NativeWidgetAura::GetWindowPlacement( | 339 void NativeWidgetAura::GetWindowPlacement( |
| 340 gfx::Rect* bounds, | 340 gfx::Rect* bounds, |
| 341 ui::WindowShowState* show_state) const { | 341 ui::WindowShowState* show_state) const { |
| 342 // The interface specifies returning restored bounds, not current bounds. | 342 // The interface specifies returning restored bounds, not current bounds. |
| 343 *bounds = GetRestoredBounds(); | 343 *bounds = GetRestoredBounds(); |
| 344 *show_state = window_ ? window_->GetProperty(aura::client::kShowStateKey) : | 344 *show_state = window_ ? window_->GetProperty(aura::client::kShowStateKey) : |
| 345 ui::SHOW_STATE_DEFAULT; | 345 ui::SHOW_STATE_DEFAULT; |
| 346 } | 346 } |
| 347 | 347 |
| 348 bool NativeWidgetAura::SetWindowTitle(const string16& title) { | 348 bool NativeWidgetAura::SetWindowTitle(const base::string16& title) { |
| 349 if (!window_) | 349 if (!window_) |
| 350 return false; | 350 return false; |
| 351 if (window_->title() == title) | 351 if (window_->title() == title) |
| 352 return false; | 352 return false; |
| 353 window_->set_title(title); | 353 window_->set_title(title); |
| 354 return true; | 354 return true; |
| 355 } | 355 } |
| 356 | 356 |
| 357 void NativeWidgetAura::SetWindowIcons(const gfx::ImageSkia& window_icon, | 357 void NativeWidgetAura::SetWindowIcons(const gfx::ImageSkia& window_icon, |
| 358 const gfx::ImageSkia& app_icon) { | 358 const gfx::ImageSkia& app_icon) { |
| (...skipping 784 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1143 return aura::Env::GetInstance()->IsMouseButtonDown(); | 1143 return aura::Env::GetInstance()->IsMouseButtonDown(); |
| 1144 } | 1144 } |
| 1145 | 1145 |
| 1146 // static | 1146 // static |
| 1147 bool NativeWidgetPrivate::IsTouchDown() { | 1147 bool NativeWidgetPrivate::IsTouchDown() { |
| 1148 return aura::Env::GetInstance()->is_touch_down(); | 1148 return aura::Env::GetInstance()->is_touch_down(); |
| 1149 } | 1149 } |
| 1150 | 1150 |
| 1151 } // namespace internal | 1151 } // namespace internal |
| 1152 } // namespace views | 1152 } // namespace views |
| OLD | NEW |