| 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 | 69 |
| 70 } // namespace | 70 } // namespace |
| 71 | 71 |
| 72 //////////////////////////////////////////////////////////////////////////////// | 72 //////////////////////////////////////////////////////////////////////////////// |
| 73 // NativeWidgetAura, public: | 73 // NativeWidgetAura, public: |
| 74 | 74 |
| 75 NativeWidgetAura::NativeWidgetAura(internal::NativeWidgetDelegate* delegate) | 75 NativeWidgetAura::NativeWidgetAura(internal::NativeWidgetDelegate* delegate) |
| 76 : delegate_(delegate), | 76 : delegate_(delegate), |
| 77 window_(new aura::Window(this)), | 77 window_(new aura::Window(this)), |
| 78 ownership_(Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET), | 78 ownership_(Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET), |
| 79 close_widget_factory_(this), | |
| 80 destroying_(false), | 79 destroying_(false), |
| 81 cursor_(gfx::kNullCursor), | 80 cursor_(gfx::kNullCursor), |
| 82 saved_window_state_(ui::SHOW_STATE_DEFAULT) { | 81 saved_window_state_(ui::SHOW_STATE_DEFAULT), |
| 82 close_widget_factory_(this) { |
| 83 aura::client::SetFocusChangeObserver(window_, this); | 83 aura::client::SetFocusChangeObserver(window_, this); |
| 84 aura::client::SetActivationChangeObserver(window_, this); | 84 aura::client::SetActivationChangeObserver(window_, this); |
| 85 } | 85 } |
| 86 | 86 |
| 87 // static | 87 // static |
| 88 void NativeWidgetAura::RegisterNativeWidgetForWindow( | 88 void NativeWidgetAura::RegisterNativeWidgetForWindow( |
| 89 internal::NativeWidgetPrivate* native_widget, | 89 internal::NativeWidgetPrivate* native_widget, |
| 90 aura::Window* window) { | 90 aura::Window* window) { |
| 91 window->set_user_data(native_widget); | 91 window->set_user_data(native_widget); |
| 92 } | 92 } |
| (...skipping 1082 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1175 l10n_util::AdjustUIFont(&(ncm.lfCaptionFont)); | 1175 l10n_util::AdjustUIFont(&(ncm.lfCaptionFont)); |
| 1176 base::win::ScopedHFONT caption_font(CreateFontIndirect(&(ncm.lfCaptionFont))); | 1176 base::win::ScopedHFONT caption_font(CreateFontIndirect(&(ncm.lfCaptionFont))); |
| 1177 return gfx::FontList(gfx::Font(caption_font)); | 1177 return gfx::FontList(gfx::Font(caption_font)); |
| 1178 #else | 1178 #else |
| 1179 return gfx::FontList(); | 1179 return gfx::FontList(); |
| 1180 #endif | 1180 #endif |
| 1181 } | 1181 } |
| 1182 | 1182 |
| 1183 } // namespace internal | 1183 } // namespace internal |
| 1184 } // namespace views | 1184 } // namespace views |
| OLD | NEW |