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 372 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
383 | 383 |
384 gfx::NativeView Widget::GetNativeView() const { | 384 gfx::NativeView Widget::GetNativeView() const { |
385 return native_widget_->GetNativeView(); | 385 return native_widget_->GetNativeView(); |
386 } | 386 } |
387 | 387 |
388 gfx::NativeWindow Widget::GetNativeWindow() const { | 388 gfx::NativeWindow Widget::GetNativeWindow() const { |
389 return native_widget_->GetNativeWindow(); | 389 return native_widget_->GetNativeWindow(); |
390 } | 390 } |
391 | 391 |
392 void Widget::AddObserver(WidgetObserver* observer) { | 392 void Widget::AddObserver(WidgetObserver* observer) { |
| 393 // Make sure that there is no nullptr in observer list. crbug.com/471649. |
| 394 CHECK(observer); |
393 observers_.AddObserver(observer); | 395 observers_.AddObserver(observer); |
394 } | 396 } |
395 | 397 |
396 void Widget::RemoveObserver(WidgetObserver* observer) { | 398 void Widget::RemoveObserver(WidgetObserver* observer) { |
397 observers_.RemoveObserver(observer); | 399 observers_.RemoveObserver(observer); |
398 } | 400 } |
399 | 401 |
400 bool Widget::HasObserver(const WidgetObserver* observer) const { | 402 bool Widget::HasObserver(const WidgetObserver* observer) const { |
401 return observers_.HasObserver(observer); | 403 return observers_.HasObserver(observer); |
402 } | 404 } |
(...skipping 1135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1538 | 1540 |
1539 //////////////////////////////////////////////////////////////////////////////// | 1541 //////////////////////////////////////////////////////////////////////////////// |
1540 // internal::NativeWidgetPrivate, NativeWidget implementation: | 1542 // internal::NativeWidgetPrivate, NativeWidget implementation: |
1541 | 1543 |
1542 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() { | 1544 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() { |
1543 return this; | 1545 return this; |
1544 } | 1546 } |
1545 | 1547 |
1546 } // namespace internal | 1548 } // namespace internal |
1547 } // namespace views | 1549 } // namespace views |
OLD | NEW |