ash/common/system/chromeos/power/tray_power.cc - Issue 2072013002: mash: Move tray settings and deps to 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/common/system/chromeos/power/tray_power.cc

Issue 2072013002: mash: Move tray settings and deps to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Undo 'git cl format' and nullptr changes. Created 4 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:

Index: ash/common/system/chromeos/power/tray_power.cc

diff --git a/ash/system/chromeos/power/tray_power.cc b/ash/common/system/chromeos/power/tray_power.cc

similarity index 97%

rename from ash/system/chromeos/power/tray_power.cc

rename to ash/common/system/chromeos/power/tray_power.cc

index ecfaa857a87d8ea3a8c13335763df405426addc4..22e8ec1cfa6504f46096e7819a73cbc553b86c6e 100644

--- a/ash/system/chromeos/power/tray_power.cc

+++ b/ash/common/system/chromeos/power/tray_power.cc

@@ -2,21 +2,20 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "ash/system/chromeos/power/tray_power.h"

+#include "ash/common/system/chromeos/power/tray_power.h"

#include <utility>

#include "ash/ash_switches.h"

#include "ash/common/accessibility_delegate.h"

+#include "ash/common/system/chromeos/devicetype_utils.h"

+#include "ash/common/system/chromeos/power/battery_notification.h"

+#include "ash/common/system/chromeos/power/dual_role_notification.h"

#include "ash/common/system/date/date_view.h"

+#include "ash/common/system/system_notifier.h"

#include "ash/common/system/tray/system_tray_delegate.h"

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

#include "ash/common/system/tray/tray_utils.h"

-#include "ash/shell.h"

-#include "ash/system/chromeos/devicetype_utils.h"

-#include "ash/system/chromeos/power/battery_notification.h"

-#include "ash/system/chromeos/power/dual_role_notification.h"

-#include "ash/system/system_notifier.h"

#include "base/command_line.h"

#include "base/logging.h"

#include "base/metrics/histogram.h"