| 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/debug/trace_event.h" | 7 #include "base/debug/trace_event.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 864 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 875 frame_type_ = ShouldUseNativeFrame() ? FRAME_TYPE_FORCE_CUSTOM : | 875 frame_type_ = ShouldUseNativeFrame() ? FRAME_TYPE_FORCE_CUSTOM : |
| 876 FRAME_TYPE_FORCE_NATIVE; | 876 FRAME_TYPE_FORCE_NATIVE; |
| 877 } else { | 877 } else { |
| 878 frame_type_ = frame_type_ == FRAME_TYPE_FORCE_CUSTOM ? | 878 frame_type_ = frame_type_ == FRAME_TYPE_FORCE_CUSTOM ? |
| 879 FRAME_TYPE_FORCE_NATIVE : FRAME_TYPE_FORCE_CUSTOM; | 879 FRAME_TYPE_FORCE_NATIVE : FRAME_TYPE_FORCE_CUSTOM; |
| 880 } | 880 } |
| 881 FrameTypeChanged(); | 881 FrameTypeChanged(); |
| 882 } | 882 } |
| 883 | 883 |
| 884 void Widget::FrameTypeChanged() { | 884 void Widget::FrameTypeChanged() { |
| 885 native_widget_->FrameTypeChanged(); | 885 native_widget_->FrameTypeChanged(frame_type_); |
| 886 } | 886 } |
| 887 | 887 |
| 888 const ui::Compositor* Widget::GetCompositor() const { | 888 const ui::Compositor* Widget::GetCompositor() const { |
| 889 return native_widget_->GetCompositor(); | 889 return native_widget_->GetCompositor(); |
| 890 } | 890 } |
| 891 | 891 |
| 892 ui::Compositor* Widget::GetCompositor() { | 892 ui::Compositor* Widget::GetCompositor() { |
| 893 return native_widget_->GetCompositor(); | 893 return native_widget_->GetCompositor(); |
| 894 } | 894 } |
| 895 | 895 |
| (...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1431 | 1431 |
| 1432 //////////////////////////////////////////////////////////////////////////////// | 1432 //////////////////////////////////////////////////////////////////////////////// |
| 1433 // internal::NativeWidgetPrivate, NativeWidget implementation: | 1433 // internal::NativeWidgetPrivate, NativeWidget implementation: |
| 1434 | 1434 |
| 1435 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() { | 1435 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() { |
| 1436 return this; | 1436 return this; |
| 1437 } | 1437 } |
| 1438 | 1438 |
| 1439 } // namespace internal | 1439 } // namespace internal |
| 1440 } // namespace views | 1440 } // namespace views |
| OLD | NEW |