| 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/aura_constants.h" | 10 #include "ui/aura/client/aura_constants.h" |
| (...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 349 *bounds = GetRestoredBounds(); | 349 *bounds = GetRestoredBounds(); |
| 350 *show_state = window_ ? window_->GetProperty(aura::client::kShowStateKey) : | 350 *show_state = window_ ? window_->GetProperty(aura::client::kShowStateKey) : |
| 351 ui::SHOW_STATE_DEFAULT; | 351 ui::SHOW_STATE_DEFAULT; |
| 352 } | 352 } |
| 353 | 353 |
| 354 bool NativeWidgetAura::SetWindowTitle(const base::string16& title) { | 354 bool NativeWidgetAura::SetWindowTitle(const base::string16& title) { |
| 355 if (!window_) | 355 if (!window_) |
| 356 return false; | 356 return false; |
| 357 if (window_->title() == title) | 357 if (window_->title() == title) |
| 358 return false; | 358 return false; |
| 359 window_->set_title(title); | 359 window_->SetTitle(title); |
| 360 return true; | 360 return true; |
| 361 } | 361 } |
| 362 | 362 |
| 363 void NativeWidgetAura::SetWindowIcons(const gfx::ImageSkia& window_icon, | 363 void NativeWidgetAura::SetWindowIcons(const gfx::ImageSkia& window_icon, |
| 364 const gfx::ImageSkia& app_icon) { | 364 const gfx::ImageSkia& app_icon) { |
| 365 // Aura doesn't have window icons. | 365 // Aura doesn't have window icons. |
| 366 } | 366 } |
| 367 | 367 |
| 368 void NativeWidgetAura::InitModalType(ui::ModalType modal_type) { | 368 void NativeWidgetAura::InitModalType(ui::ModalType modal_type) { |
| 369 if (modal_type != ui::MODAL_TYPE_NONE) | 369 if (modal_type != ui::MODAL_TYPE_NONE) |
| (...skipping 785 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1155 l10n_util::AdjustUIFont(&(ncm.lfCaptionFont)); | 1155 l10n_util::AdjustUIFont(&(ncm.lfCaptionFont)); |
| 1156 base::win::ScopedHFONT caption_font(CreateFontIndirect(&(ncm.lfCaptionFont))); | 1156 base::win::ScopedHFONT caption_font(CreateFontIndirect(&(ncm.lfCaptionFont))); |
| 1157 return gfx::FontList(gfx::Font(caption_font)); | 1157 return gfx::FontList(gfx::Font(caption_font)); |
| 1158 #else | 1158 #else |
| 1159 return gfx::FontList(); | 1159 return gfx::FontList(); |
| 1160 #endif | 1160 #endif |
| 1161 } | 1161 } |
| 1162 | 1162 |
| 1163 } // namespace internal | 1163 } // namespace internal |
| 1164 } // namespace views | 1164 } // namespace views |
| OLD | NEW |