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/widget.h" | 5 #include "ui/views/widget/widget.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "base/trace_event/trace_event.h" | 10 #include "base/trace_event/trace_event.h" |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
50 for (int i = 0; i < view->child_count(); ++i) | 50 for (int i = 0; i < view->child_count(); ++i) |
51 BuildRootLayers(view->child_at(i), layers); | 51 BuildRootLayers(view->child_at(i), layers); |
52 } | 52 } |
53 } | 53 } |
54 | 54 |
55 // Create a native widget implementation. | 55 // Create a native widget implementation. |
56 // First, use the supplied one if non-NULL. | 56 // First, use the supplied one if non-NULL. |
57 // Finally, make a default one. | 57 // Finally, make a default one. |
58 NativeWidget* CreateNativeWidget(NativeWidget* native_widget, | 58 NativeWidget* CreateNativeWidget(NativeWidget* native_widget, |
59 internal::NativeWidgetDelegate* delegate) { | 59 internal::NativeWidgetDelegate* delegate) { |
| 60 LOG(ERROR) << "widget.cc: CreateNativeWidget, native_widget=" << native_widget
; |
60 if (!native_widget) { | 61 if (!native_widget) { |
61 native_widget = | 62 native_widget = |
62 internal::NativeWidgetPrivate::CreateNativeWidget(delegate); | 63 internal::NativeWidgetPrivate::CreateNativeWidget(delegate); |
63 } | 64 } |
64 return native_widget; | 65 return native_widget; |
65 } | 66 } |
66 | 67 |
67 void NotifyCaretBoundsChanged(ui::InputMethod* input_method) { | 68 void NotifyCaretBoundsChanged(ui::InputMethod* input_method) { |
68 if (!input_method) | 69 if (!input_method) |
69 return; | 70 return; |
(...skipping 1413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1483 | 1484 |
1484 //////////////////////////////////////////////////////////////////////////////// | 1485 //////////////////////////////////////////////////////////////////////////////// |
1485 // internal::NativeWidgetPrivate, NativeWidget implementation: | 1486 // internal::NativeWidgetPrivate, NativeWidget implementation: |
1486 | 1487 |
1487 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() { | 1488 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() { |
1488 return this; | 1489 return this; |
1489 } | 1490 } |
1490 | 1491 |
1491 } // namespace internal | 1492 } // namespace internal |
1492 } // namespace views | 1493 } // namespace views |
OLD | NEW |