ash/system/web_notification/web_notification_tray.h - Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3"

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ash/system/web_notification/web_notification_tray.h

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)

Patch Set: Created 3 years, 9 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 | « ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc ('k') | ash/system/web_notification/web_notification_tray.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_	5 #ifndef ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_

6 #define ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_	6 #define ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_

7	7

8 #include <memory>	8 #include <memory>

9	9

10 #include "ash/ash_export.h"	10 #include "ash/ash_export.h"

11 #include "ash/login_status.h"	11 #include "ash/common/login_status.h"

12 #include "ash/system/tray/tray_background_view.h"	12 #include "ash/system/tray/tray_background_view.h"

13 #include "base/gtest_prod_util.h"	13 #include "base/gtest_prod_util.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 "ui/base/models/simple_menu_model.h"	16 #include "ui/base/models/simple_menu_model.h"

17 #include "ui/gfx/animation/animation_container.h"	17 #include "ui/gfx/animation/animation_container.h"

18 #include "ui/message_center/message_center_tray.h"	18 #include "ui/message_center/message_center_tray.h"

19 #include "ui/message_center/message_center_tray_delegate.h"	19 #include "ui/message_center/message_center_tray_delegate.h"

20 #include "ui/views/bubble/tray_bubble_view.h"	20 #include "ui/views/bubble/tray_bubble_view.h"

21	21

(...skipping 159 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
181 bool should_block_shelf_auto_hide_;	181 bool should_block_shelf_auto_hide_;

182	182

183 std::unique_ptr<AshPopupAlignmentDelegate> popup_alignment_delegate_;	183 std::unique_ptr<AshPopupAlignmentDelegate> popup_alignment_delegate_;

184	184

185 DISALLOW_COPY_AND_ASSIGN(WebNotificationTray);	185 DISALLOW_COPY_AND_ASSIGN(WebNotificationTray);

186 };	186 };

187	187

188 } // namespace ash	188 } // namespace ash

189	189

190 #endif // ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_	190 #endif // ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_TRAY_H_

OLD	NEW