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

Side by Side Diff: chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.h

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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/mac/scoped_nsobject.h" 10 #include "base/mac/scoped_nsobject.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "base/prefs/pref_member.h" 14 #include "components/prefs/pref_member.h"
15 #include "ui/message_center/message_center.h" 15 #include "ui/message_center/message_center.h"
16 #include "ui/message_center/message_center_tray_delegate.h" 16 #include "ui/message_center/message_center_tray_delegate.h"
17 17
18 @class MCPopupCollection; 18 @class MCPopupCollection;
19 19
20 namespace message_center { 20 namespace message_center {
21 class MessageCenter; 21 class MessageCenter;
22 class MessageCenterTray; 22 class MessageCenterTray;
23 } 23 }
24 24
(...skipping 28 matching lines...) Expand all
53 // C++ controller for the notification tray UI. 53 // C++ controller for the notification tray UI.
54 scoped_ptr<message_center::MessageCenterTray> tray_; 54 scoped_ptr<message_center::MessageCenterTray> tray_;
55 55
56 // Obj-C controller for the on-screen popup notifications. 56 // Obj-C controller for the on-screen popup notifications.
57 base::scoped_nsobject<MCPopupCollection> popup_collection_; 57 base::scoped_nsobject<MCPopupCollection> popup_collection_;
58 58
59 DISALLOW_COPY_AND_ASSIGN(MessageCenterTrayBridge); 59 DISALLOW_COPY_AND_ASSIGN(MessageCenterTrayBridge);
60 }; 60 };
61 61
62 #endif // CHROME_BROWSER_UI_COCOA_NOTIFICATIONS_MESSAGE_CENTER_TRAY_BRIDGE_H_ 62 #endif // CHROME_BROWSER_UI_COCOA_NOTIFICATIONS_MESSAGE_CENTER_TRAY_BRIDGE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698