| 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.h" | 9 #include "base/message_loop.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 1399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1410 if (bounds->height() < minimum_size.height()) | 1410 if (bounds->height() < minimum_size.height()) |
| 1411 bounds->set_height(minimum_size.height()); | 1411 bounds->set_height(minimum_size.height()); |
| 1412 } | 1412 } |
| 1413 return true; | 1413 return true; |
| 1414 } | 1414 } |
| 1415 return false; | 1415 return false; |
| 1416 } | 1416 } |
| 1417 | 1417 |
| 1418 void Widget::ReplaceInputMethod(InputMethod* input_method) { | 1418 void Widget::ReplaceInputMethod(InputMethod* input_method) { |
| 1419 input_method_.reset(input_method); | 1419 input_method_.reset(input_method); |
| 1420 input_method->set_delegate(native_widget_->GetInputMethodDelegate()); | 1420 input_method->SetDelegate(native_widget_->GetInputMethodDelegate()); |
| 1421 input_method->Init(this); | 1421 input_method->Init(this); |
| 1422 } | 1422 } |
| 1423 | 1423 |
| 1424 namespace internal { | 1424 namespace internal { |
| 1425 | 1425 |
| 1426 //////////////////////////////////////////////////////////////////////////////// | 1426 //////////////////////////////////////////////////////////////////////////////// |
| 1427 // internal::NativeWidgetPrivate, NativeWidget implementation: | 1427 // internal::NativeWidgetPrivate, NativeWidget implementation: |
| 1428 | 1428 |
| 1429 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() { | 1429 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() { |
| 1430 return this; | 1430 return this; |
| 1431 } | 1431 } |
| 1432 | 1432 |
| 1433 } // namespace internal | 1433 } // namespace internal |
| 1434 } // namespace views | 1434 } // namespace views |
| OLD | NEW |