ash/system/tray/system_tray.cc - Issue 2131733002: mash: Migrate [Keyboard]Brightness code to ash/common.

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

Unified Diff: ash/system/tray/system_tray.cc

Issue 2131733002: mash: Migrate [Keyboard]Brightness code to ash/common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Sync and rebase. Created 4 years, 5 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 side-by-side diff with in-line comments

Download patch

Index: ash/system/tray/system_tray.cc

diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc

index 8691317a273d64f62b37fe1c1a3d779ff3ab2f38..7ff99076844da279ced79f44533d87f35cd6f34a 100644

--- a/ash/system/tray/system_tray.cc

+++ b/ash/system/tray/system_tray.cc

@@ -46,6 +46,7 @@

#if defined(OS_CHROMEOS)

#include "ash/common/system/chromeos/audio/tray_audio_chromeos.h"

#include "ash/common/system/chromeos/bluetooth/tray_bluetooth.h"

+#include "ash/common/system/chromeos/brightness/tray_brightness.h"

James Cook 2016/07/07 23:08:49 Hooray!

msw 2016/07/08 01:40:48 Acknowledged.

#include "ash/common/system/chromeos/enterprise/tray_enterprise.h"

#include "ash/common/system/chromeos/network/tray_network.h"

#include "ash/common/system/chromeos/network/tray_sms.h"

@@ -60,7 +61,6 @@

#include "ash/common/system/chromeos/tray_caps_lock.h"

#include "ash/common/system/chromeos/tray_tracing.h"

#include "ash/common/system/ime/tray_ime_chromeos.h"

-#include "ash/system/chromeos/brightness/tray_brightness.h"

#include "ash/system/chromeos/media_security/multi_profile_media_tray_item.h"

#include "ash/system/chromeos/rotation/tray_rotation_lock.h"

#include "ash/system/chromeos/tray_display.h"

« ash/shell.cc ('K') | « ash/system/keyboard_brightness/keyboard_brightness_control_delegate.h ('k') | ash/test/ash_test_base.h » ('j') | ash/test/ash_test_base.h » ('J')