| 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.h" | 8 #include "base/message_loop.h" |
| 9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 10 #include "ui/base/events/event.h" | 10 #include "ui/base/events/event.h" |
| (...skipping 762 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 773 } | 773 } |
| 774 | 774 |
| 775 void Widget::SetFocusTraversableParentView(View* parent_view) { | 775 void Widget::SetFocusTraversableParentView(View* parent_view) { |
| 776 root_view_->SetFocusTraversableParentView(parent_view); | 776 root_view_->SetFocusTraversableParentView(parent_view); |
| 777 } | 777 } |
| 778 | 778 |
| 779 void Widget::ClearNativeFocus() { | 779 void Widget::ClearNativeFocus() { |
| 780 native_widget_->ClearNativeFocus(); | 780 native_widget_->ClearNativeFocus(); |
| 781 } | 781 } |
| 782 | 782 |
| 783 void Widget::FocusNativeView(gfx::NativeView native_view) { | |
| 784 native_widget_->FocusNativeView(native_view); | |
| 785 } | |
| 786 | |
| 787 NonClientFrameView* Widget::CreateNonClientFrameView() { | 783 NonClientFrameView* Widget::CreateNonClientFrameView() { |
| 788 NonClientFrameView* frame_view = | 784 NonClientFrameView* frame_view = |
| 789 widget_delegate_->CreateNonClientFrameView(this); | 785 widget_delegate_->CreateNonClientFrameView(this); |
| 790 if (!frame_view) | 786 if (!frame_view) |
| 791 frame_view = native_widget_->CreateNonClientFrameView(); | 787 frame_view = native_widget_->CreateNonClientFrameView(); |
| 792 if (!frame_view && ViewsDelegate::views_delegate) { | 788 if (!frame_view && ViewsDelegate::views_delegate) { |
| 793 frame_view = | 789 frame_view = |
| 794 ViewsDelegate::views_delegate->CreateDefaultNonClientFrameView(this); | 790 ViewsDelegate::views_delegate->CreateDefaultNonClientFrameView(this); |
| 795 } | 791 } |
| 796 if (frame_view) | 792 if (frame_view) |
| (...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1347 | 1343 |
| 1348 //////////////////////////////////////////////////////////////////////////////// | 1344 //////////////////////////////////////////////////////////////////////////////// |
| 1349 // internal::NativeWidgetPrivate, NativeWidget implementation: | 1345 // internal::NativeWidgetPrivate, NativeWidget implementation: |
| 1350 | 1346 |
| 1351 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() { | 1347 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() { |
| 1352 return this; | 1348 return this; |
| 1353 } | 1349 } |
| 1354 | 1350 |
| 1355 } // namespace internal | 1351 } // namespace internal |
| 1356 } // namespace views | 1352 } // namespace views |
| OLD | NEW |