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

Side by Side Diff: chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 #ifndef CHROME_BROWSER_UI_COCOA_NOTIFICATIONS_MESSAGE_CENTER_TRAY_BRIDGE_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_NOTIFICATIONS_MESSAGE_CENTER_TRAY_BRIDGE_H_
6 #define CHROME_BROWSER_UI_COCOA_NOTIFICATIONS_MESSAGE_CENTER_TRAY_BRIDGE_H_ 6 #define CHROME_BROWSER_UI_COCOA_NOTIFICATIONS_MESSAGE_CENTER_TRAY_BRIDGE_H_
7 7
8 #import <AppKit/AppKit.h> 8 #import <AppKit/AppKit.h>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 70
71 // Obj-C window controller for the notification tray. 71 // Obj-C window controller for the notification tray.
72 base::scoped_nsobject<MCTrayController> tray_controller_; 72 base::scoped_nsobject<MCTrayController> tray_controller_;
73 73
74 // View that is displayed on the system menu bar item. 74 // View that is displayed on the system menu bar item.
75 base::scoped_nsobject<MCStatusItemView> status_item_view_; 75 base::scoped_nsobject<MCStatusItemView> status_item_view_;
76 76
77 // Obj-C controller for the on-screen popup notifications. 77 // Obj-C controller for the on-screen popup notifications.
78 base::scoped_nsobject<MCPopupCollection> popup_collection_; 78 base::scoped_nsobject<MCPopupCollection> popup_collection_;
79 79
80 // Weak pointer factory to posts tasks to self.
81 base::WeakPtrFactory<MessageCenterTrayBridge> weak_ptr_factory_;
82
83 // A PrefMember that calls OnShowStatusItemChanged when the pref is updated 80 // A PrefMember that calls OnShowStatusItemChanged when the pref is updated
84 // by the user's selection in the main menu. 81 // by the user's selection in the main menu.
85 BooleanPrefMember show_status_item_; 82 BooleanPrefMember show_status_item_;
86 83
84 // Weak pointer factory to posts tasks to self.
85 base::WeakPtrFactory<MessageCenterTrayBridge> weak_ptr_factory_;
86
87 DISALLOW_COPY_AND_ASSIGN(MessageCenterTrayBridge); 87 DISALLOW_COPY_AND_ASSIGN(MessageCenterTrayBridge);
88 }; 88 };
89 89
90 #endif // CHROME_BROWSER_UI_COCOA_NOTIFICATIONS_MESSAGE_CENTER_TRAY_BRIDGE_H_ 90 #endif // CHROME_BROWSER_UI_COCOA_NOTIFICATIONS_MESSAGE_CENTER_TRAY_BRIDGE_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.mm ('k') | chrome/browser/ui/cocoa/status_bubble_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698