ash/system/tray/tray_notification_view.cc - Issue 480693002: Use a qualified path for ui_resources.h grit includes.

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/tray/tray_notification_view.cc

Issue 480693002: Use a qualified path for ui_resources.h grit includes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 4 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 | Annotate | Revision Log

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 #include "ash/system/tray/tray_notification_view.h"	5 #include "ash/system/tray/tray_notification_view.h"

6	6

7 #include "ash/system/tray/system_tray_item.h"	7 #include "ash/system/tray/system_tray_item.h"

8 #include "ash/system/tray/tray_constants.h"	8 #include "ash/system/tray/tray_constants.h"

9 #include "grit/ash_strings.h"	9 #include "grit/ash_strings.h"

10 #include "grit/ui_resources.h"

11 #include "ui/base/resource/resource_bundle.h"	10 #include "ui/base/resource/resource_bundle.h"

12 #include "ui/gfx/image/image_skia.h"	11 #include "ui/gfx/image/image_skia.h"

	12 #include "ui/resources/grit/ui_resources.h"

13 #include "ui/views/background.h"	13 #include "ui/views/background.h"

14 #include "ui/views/controls/button/image_button.h"	14 #include "ui/views/controls/button/image_button.h"

15 #include "ui/views/controls/image_view.h"	15 #include "ui/views/controls/image_view.h"

16 #include "ui/views/layout/grid_layout.h"	16 #include "ui/views/layout/grid_layout.h"

17	17

18 namespace ash {	18 namespace ash {

19	19

20 TrayNotificationView::TrayNotificationView(SystemTrayItem* owner, int icon_id)	20 TrayNotificationView::TrayNotificationView(SystemTrayItem* owner, int icon_id)

21 : owner_(owner),	21 : owner_(owner),

22 icon_id_(icon_id),	22 icon_id_(icon_id),

(...skipping 139 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
162 OnClose();	162 OnClose();

163 owner_->HideNotificationView();	163 owner_->HideNotificationView();

164 }	164 }

165	165

166 void TrayNotificationView::HandleClickAction() {	166 void TrayNotificationView::HandleClickAction() {

167 HandleClose();	167 HandleClose();

168 OnClickAction();	168 OnClickAction();

169 }	169 }

170	170

171 } // namespace ash	171 } // namespace ash

OLD	NEW

« ash/DEPS ('K') | « ash/system/tray/tray_bar_button_with_title.cc ('k') | ash/system/user/accounts_detailed_view.cc » ('j') | no next file with comments »