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

Side by Side Diff: ui/message_center/views/message_popup_collection.h

Issue 1965073002: Rename gfx::Display to display::Display (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 7 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
« no previous file with comments | « ui/gfx/test/gfx_util.cc ('k') | ui/message_center/views/popup_alignment_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 UI_MESSAGE_CENTER_VIEWS_MESSAGE_POPUP_COLLECTION_H_ 5 #ifndef UI_MESSAGE_CENTER_VIEWS_MESSAGE_POPUP_COLLECTION_H_
6 #define UI_MESSAGE_CENTER_VIEWS_MESSAGE_POPUP_COLLECTION_H_ 6 #define UI_MESSAGE_CENTER_VIEWS_MESSAGE_POPUP_COLLECTION_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <list> 10 #include <list>
11 #include <map> 11 #include <map>
12 12
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
16 #include "base/timer/timer.h" 16 #include "base/timer/timer.h"
17 #include "ui/gfx/geometry/rect.h" 17 #include "ui/gfx/geometry/rect.h"
18 #include "ui/gfx/native_widget_types.h" 18 #include "ui/gfx/native_widget_types.h"
19 #include "ui/message_center/message_center_export.h" 19 #include "ui/message_center/message_center_export.h"
20 #include "ui/message_center/message_center_observer.h" 20 #include "ui/message_center/message_center_observer.h"
21 #include "ui/message_center/views/message_center_controller.h" 21 #include "ui/message_center/views/message_center_controller.h"
22 #include "ui/message_center/views/toast_contents_view.h" 22 #include "ui/message_center/views/toast_contents_view.h"
23 #include "ui/views/widget/widget_observer.h" 23 #include "ui/views/widget/widget_observer.h"
24 24
25 namespace base { 25 namespace base {
26 class RunLoop; 26 class RunLoop;
27 } 27 }
28 28
29 namespace display {
30 class Display;
31 }
32
29 namespace views { 33 namespace views {
30 class Widget; 34 class Widget;
31 } 35 }
32 36
33 namespace gfx {
34 class Display;
35 }
36
37 namespace display {
38 using Display = gfx::Display;
39 }
40
41 namespace message_center { 37 namespace message_center {
42 namespace test { 38 namespace test {
43 class MessagePopupCollectionTest; 39 class MessagePopupCollectionTest;
44 } 40 }
45 41
46 class MessageCenter; 42 class MessageCenter;
47 class MessageCenterTray; 43 class MessageCenterTray;
48 class MessageViewContextMenuController; 44 class MessageViewContextMenuController;
49 class PopupAlignmentDelegate; 45 class PopupAlignmentDelegate;
50 46
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 // Gives out weak pointers to toast contents views which have an unrelated 181 // Gives out weak pointers to toast contents views which have an unrelated
186 // lifetime. Must remain the last member variable. 182 // lifetime. Must remain the last member variable.
187 base::WeakPtrFactory<MessagePopupCollection> weak_factory_; 183 base::WeakPtrFactory<MessagePopupCollection> weak_factory_;
188 184
189 DISALLOW_COPY_AND_ASSIGN(MessagePopupCollection); 185 DISALLOW_COPY_AND_ASSIGN(MessagePopupCollection);
190 }; 186 };
191 187
192 } // namespace message_center 188 } // namespace message_center
193 189
194 #endif // UI_MESSAGE_CENTER_VIEWS_MESSAGE_POPUP_COLLECTION_H_ 190 #endif // UI_MESSAGE_CENTER_VIEWS_MESSAGE_POPUP_COLLECTION_H_
OLDNEW
« no previous file with comments | « ui/gfx/test/gfx_util.cc ('k') | ui/message_center/views/popup_alignment_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698