diff options
| author | anujk.sharma <anujk.sharma@samsung.com> | 2014-09-02 22:47:09 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-03 05:49:53 +0000 |
| commit | 8b5b6319ddca5d1e2044b99fddc6d3a61a6efd1c (patch) | |
| tree | d302abbbf67510a44d5370835ae82e14af12d227 /ui/message_center | |
| parent | 9e86b4cc2f97f933bf538af331b8979acdbb1f67 (diff) | |
| download | chromium_src-8b5b6319ddca5d1e2044b99fddc6d3a61a6efd1c.zip chromium_src-8b5b6319ddca5d1e2044b99fddc6d3a61a6efd1c.tar.gz chromium_src-8b5b6319ddca5d1e2044b99fddc6d3a61a6efd1c.tar.bz2 | |
Changing the order of weak_ptr_factory in src/ui module, to ensure proper cleanup while object is inactive.
BUG=303818
Review URL: https://codereview.chromium.org/533553002
Cr-Commit-Position: refs/heads/master@{#293078}
Diffstat (limited to 'ui/message_center')
| -rw-r--r-- | ui/message_center/views/message_bubble_base.cc | 4 | ||||
| -rw-r--r-- | ui/message_center/views/message_bubble_base.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ui/message_center/views/message_bubble_base.cc b/ui/message_center/views/message_bubble_base.cc index c230c2d..3f1755a 100644 --- a/ui/message_center/views/message_bubble_base.cc +++ b/ui/message_center/views/message_bubble_base.cc @@ -26,8 +26,8 @@ MessageBubbleBase::MessageBubbleBase(MessageCenter* message_center, : message_center_(message_center), tray_(tray), bubble_view_(NULL), - weak_ptr_factory_(this), - max_height_(kMessageBubbleBaseDefaultMaxHeight) { + max_height_(kMessageBubbleBaseDefaultMaxHeight), + weak_ptr_factory_(this) { } MessageBubbleBase::~MessageBubbleBase() { diff --git a/ui/message_center/views/message_bubble_base.h b/ui/message_center/views/message_bubble_base.h index 27d2e51..5c37365 100644 --- a/ui/message_center/views/message_bubble_base.h +++ b/ui/message_center/views/message_bubble_base.h @@ -70,8 +70,8 @@ class MESSAGE_CENTER_EXPORT MessageBubbleBase { MessageCenter* message_center_; MessageCenterTray* tray_; views::TrayBubbleView* bubble_view_; - base::WeakPtrFactory<MessageBubbleBase> weak_ptr_factory_; int max_height_; + base::WeakPtrFactory<MessageBubbleBase> weak_ptr_factory_; DISALLOW_COPY_AND_ASSIGN(MessageBubbleBase); }; |