ash/system/brightness/tray_brightness.cc - Issue 2920613003: Clean up unused grit header includes in ash/.

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/brightness/tray_brightness.cc

Issue 2920613003: Clean up unused grit header includes in ash/. (Closed)

Patch Set: Created 3 years, 6 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

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 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 #include "ash/system/brightness/tray_brightness.h"	5 #include "ash/system/brightness/tray_brightness.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8	8

9 #include "ash/resources/grit/ash_resources.h"

10 #include "ash/resources/vector_icons/vector_icons.h"	9 #include "ash/resources/vector_icons/vector_icons.h"

11 #include "ash/shell.h"	10 #include "ash/shell.h"

12 #include "ash/shell_observer.h"	11 #include "ash/shell_observer.h"

13 #include "ash/shell_port.h"	12 #include "ash/shell_port.h"

14 #include "ash/strings/grit/ash_strings.h"	13 #include "ash/strings/grit/ash_strings.h"

15 #include "ash/system/brightness_control_delegate.h"	14 #include "ash/system/brightness_control_delegate.h"

16 #include "ash/system/tray/tray_constants.h"	15 #include "ash/system/tray/tray_constants.h"

17 #include "ash/system/tray/tray_popup_utils.h"	16 #include "ash/system/tray/tray_popup_utils.h"

18 #include "ash/system/tray/tri_view.h"	17 #include "ash/system/tray/tri_view.h"

19 #include "ash/wm/maximize_mode/maximize_mode_controller.h"	18 #include "ash/wm/maximize_mode/maximize_mode_controller.h"

(...skipping 248 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
268 if (!display::Display::HasInternalDisplay())	267 if (!display::Display::HasInternalDisplay())

269 return;	268 return;

270	269

271 if (brightness_view_ && brightness_view_->visible())	270 if (brightness_view_ && brightness_view_->visible())

272 SetDetailedViewCloseDelay(kTrayPopupAutoCloseDelayInSeconds);	271 SetDetailedViewCloseDelay(kTrayPopupAutoCloseDelayInSeconds);

273 else	272 else

274 ShowDetailedView(kTrayPopupAutoCloseDelayInSeconds, false);	273 ShowDetailedView(kTrayPopupAutoCloseDelayInSeconds, false);

275 }	274 }

276	275

277 } // namespace ash	276 } // namespace ash

OLD	NEW

« no previous file with comments | « ash/system/bluetooth/tray_bluetooth.cc ('k') | ash/system/ime_menu/ime_list_view.cc » ('j') | no next file with comments »