Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(217)

Unified Diff: chrome/browser/ui/views/status_bubble_views.cc

Issue 780713002: Fix remaining WeakPtrFactory ordering problems (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/status_bubble_views.cc
diff --git a/chrome/browser/ui/views/status_bubble_views.cc b/chrome/browser/ui/views/status_bubble_views.cc
index f52073768d9442026c85f0c004fea6dd206fce63..c578baa6d8c3503810c42f4f6973a4649efa5af9 100644
--- a/chrome/browser/ui/views/status_bubble_views.cc
+++ b/chrome/browser/ui/views/status_bubble_views.cc
@@ -171,8 +171,6 @@ class StatusBubbleViews::StatusView : public views::View {
BubbleState state_;
BubbleStyle style_;
- base::WeakPtrFactory<StatusBubbleViews::StatusView> timer_factory_;
-
scoped_ptr<StatusViewAnimation> animation_;
// Handle to the widget that contains us.
@@ -184,6 +182,8 @@ class StatusBubbleViews::StatusView : public views::View {
// Holds the theme provider of the frame that created us.
ui::ThemeProvider* theme_service_;
+ base::WeakPtrFactory<StatusBubbleViews::StatusView> timer_factory_;
+
DISALLOW_COPY_AND_ASSIGN(StatusView);
};
@@ -191,10 +191,10 @@ StatusBubbleViews::StatusView::StatusView(views::Widget* popup,
ui::ThemeProvider* theme_provider)
: state_(BUBBLE_HIDDEN),
style_(STYLE_STANDARD),
- timer_factory_(this),
animation_(new StatusViewAnimation(this, 0, 0)),
popup_(popup),
- theme_service_(theme_provider) {
+ theme_service_(theme_provider),
+ timer_factory_(this) {
}
StatusBubbleViews::StatusView::~StatusView() {
« no previous file with comments | « chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h ('k') | chrome/browser/ui/webui/signin/user_manager_screen_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698