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

Unified Diff: chrome/browser/ui/cocoa/status_bubble_mac.h

Issue 572853002: Realigning the WeakPtrFactory initialization order in chrome/ui folder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed mac error Created 6 years, 3 months 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/cocoa/status_bubble_mac.h
diff --git a/chrome/browser/ui/cocoa/status_bubble_mac.h b/chrome/browser/ui/cocoa/status_bubble_mac.h
index ad1e0e6ace8e8396c73e53fe37b1afaa11cc1be5..9dbc7a24ec736ed2bbc07e9951ef962a42356ac3 100644
--- a/chrome/browser/ui/cocoa/status_bubble_mac.h
+++ b/chrome/browser/ui/cocoa/status_bubble_mac.h
@@ -123,17 +123,6 @@ class StatusBubbleMac : public StatusBubble {
// for the given mouse position if necessary. Protected for use in tests.
void SetFrameAvoidingMouse(NSRect window_frame, const gfx::Point& mouse_pos);
- // The factory used to generate weak pointers for the show and hide delay
- // timers.
- base::WeakPtrFactory<StatusBubbleMac> timer_factory_;
-
- // The factory used to generate weak pointers for the expansion delay timer.
- base::WeakPtrFactory<StatusBubbleMac> expand_timer_factory_;
-
- // The factory used to generate weak pointers for the CAAnimation completion
- // handlers.
- base::WeakPtrFactory<StatusBubbleMac> completion_handler_factory_;
-
// Calculate the appropriate frame for the status bubble window. If
// |expanded_width|, use entire width of parent frame.
NSRect CalculateWindowFrame(bool expanded_width);
@@ -185,6 +174,17 @@ class StatusBubbleMac : public StatusBubble {
// the standard bubble width.
std::string languages_;
+ // The factory used to generate weak pointers for the show and hide delay
+ // timers.
+ base::WeakPtrFactory<StatusBubbleMac> timer_factory_;
+
+ // The factory used to generate weak pointers for the expansion delay timer.
+ base::WeakPtrFactory<StatusBubbleMac> expand_timer_factory_;
+
+ // The factory used to generate weak pointers for the CAAnimation completion
+ // handlers.
+ base::WeakPtrFactory<StatusBubbleMac> completion_handler_factory_;
+
DISALLOW_COPY_AND_ASSIGN(StatusBubbleMac);
};
« no previous file with comments | « chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.h ('k') | chrome/browser/ui/cocoa/status_bubble_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698